From 01cd96dc27eb5a39ffd7efd65b4b848f7e2ccbb2 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 25 Mar 2007 19:18:12 +0000
Subject: - Patch #127891 by dvessel: layout variabe may end up not getting
 set.

---
 themes/engines/phptemplate/phptemplate.engine | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'themes/engines/phptemplate/phptemplate.engine')

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()) {
-- 
cgit v1.2.3