? sites/localhost.drupal
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.57
diff -u -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	23 Mar 2007 22:55:34 -0000
@@ -159,9 +159,8 @@ function phptemplate_page($content, $sho
     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, $sho
     }
     $sidebar_indicator = NULL;
   }
-  else {
-   $layout = 'none';
-  }
 
   // Construct page title
   if (drupal_get_title()) {