Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
224
Merge Requests
224
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
966be260
Commit
966be260
authored
Oct 06, 2011
by
catch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#1297370
by moshe weitzman, webchick: Fixed Default installation of D8 shows help region.
parent
27116b08
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
modules/block/block.module
modules/block/block.module
+1
-1
modules/block/block.test
modules/block/block.test
+3
-0
modules/book/book.module
modules/book/book.module
+3
-2
No files found.
modules/block/block.module
View file @
966be260
...
...
@@ -850,7 +850,7 @@ function _block_get_renderable_block($element) {
// hook_block_view_alter() or hook_block_view_MODULE_DELTA_alter().
drupal_alter
(
array
(
'block_view'
,
"block_view_
{
$block
->
module
}
_
{
$block
->
delta
}
"
),
$array
,
$block
);
if
(
empty
(
$array
))
{
if
(
empty
(
$array
[
'content'
]
))
{
// Blocks without content should emit no markup at all.
$element
+=
array
(
'#access'
=>
FALSE
,
...
...
modules/block/block.test
View file @
966be260
...
...
@@ -190,6 +190,9 @@ class BlockTestCase extends DrupalWebTestCase {
$this
->
drupalLogout
();
$this
->
drupalGet
(
''
);
$this
->
assertNoText
(
$title
,
t
(
'Block was not displayed to anonymous users.'
));
// Confirm that an empty block is not displayed.
$this
->
assertNoRaw
(
'block-system-help'
,
t
(
'Empty block not displayed.'
));
}
/**
...
...
modules/book/book.module
View file @
966be260
...
...
@@ -274,8 +274,9 @@ function book_block_view($delta = '') {
$book_menus
[
$book_id
]
=
menu_tree_output
(
$pseudo_tree
);
}
}
$book_menus
[
'#theme'
]
=
'book_all_books_block'
;
$block
[
'content'
]
=
$book_menus
;
if
(
$block
[
'content'
]
=
$book_menus
)
{
$book_menus
[
'#theme'
]
=
'book_all_books_block'
;
}
}
elseif
(
$current_bid
)
{
// Only display this block when the user is browsing a book.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment