Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
966be260
Commit
966be260
authored
Oct 06, 2011
by
Nathaniel Catchpole
Browse files
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
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
Supports
Markdown
0%
Try again
or
attach a new 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