Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.57
diff -u -w -B -F^f -r1.57 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	15 Feb 2007 11:40:19 -0000	1.57
+++ themes/engines/phptemplate/phptemplate.engine	24 Mar 2007 07:50:10 -0000
@@ -162,11 +162,13 @@ function phptemplate_page($content, $sho
   /**
   * Populate sidebars.
   */
+  $layout = 'none';
   if ($show_blocks) {
     global $sidebar_indicator;
     /**
      * Sidebar_indicator tells the block counting code to count sidebars separately.
      */
+    
     $sidebar_indicator = 'left';
     $sidebar_left = theme('blocks', 'left');
     if ($sidebar_left != '') {
@@ -180,9 +182,6 @@ function phptemplate_page($content, $sho
     }
     $sidebar_indicator = NULL;
   }
-  else {
-   $layout = 'none';
-  }
 
   // Construct page title
   if (drupal_get_title()) {