diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-03-25 19:18:12 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-03-25 19:18:12 +0000 |
| commit | 01cd96dc27eb5a39ffd7efd65b4b848f7e2ccbb2 (patch) | |
| tree | d1ae70e2282fc833b7542fd089b6c4b8a0b7ac31 /themes/engines/phptemplate/phptemplate.engine | |
| parent | f37abe6074fa387ad821776cb58d539a6e4fd47a (diff) | |
| download | brdo-01cd96dc27eb5a39ffd7efd65b4b848f7e2ccbb2.tar.gz brdo-01cd96dc27eb5a39ffd7efd65b4b848f7e2ccbb2.tar.bz2 | |
- Patch #127891 by dvessel: layout variabe may end up not getting set.
Diffstat (limited to 'themes/engines/phptemplate/phptemplate.engine')
| -rw-r--r-- | themes/engines/phptemplate/phptemplate.engine | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index 8b3e5448c..38f6dfdca 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -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()) { |