Commit d6586d2e authored by drumm's avatar drumm

Patch #127891 by dvessel: layout variabe may end up not getting set.

Backport from HEAD.
parent c2415bb8
......@@ -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()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment