- Patch #127891 by dvessel: layout variabe may end up not getting set.
parent
f37abe6074
commit
01cd96dc27
|
@ -159,9 +159,8 @@ function phptemplate_page($content, $show_blocks = TRUE) {
|
|||
drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
|
||||
}
|
||||
|
||||
/**
|
||||
* Populate sidebars.
|
||||
*/
|
||||
// Populate sidebars
|
||||
$layout = 'none';
|
||||
if ($show_blocks) {
|
||||
global $sidebar_indicator;
|
||||
/**
|
||||
|
@ -180,9 +179,6 @@ function phptemplate_page($content, $show_blocks = TRUE) {
|
|||
}
|
||||
$sidebar_indicator = NULL;
|
||||
}
|
||||
else {
|
||||
$layout = 'none';
|
||||
}
|
||||
|
||||
// Construct page title
|
||||
if (drupal_get_title()) {
|
||||
|
|
Loading…
Reference in New Issue