From fb1948cbf741802e2ffcdc0f694cea9aa99d3df5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 1 Sep 2007 05:42:49 +0000
Subject: - Patch #171652 by dvessel et al: cleanup some old cruft.  Dvessel is
 on a patch spree ...

---
 modules/system/block.tpl.php |  5 ++---
 modules/system/page.tpl.php  | 14 ++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/system/block.tpl.php b/modules/system/block.tpl.php
index 3b60cf9f0..506f894f1 100644
--- a/modules/system/block.tpl.php
+++ b/modules/system/block.tpl.php
@@ -14,10 +14,9 @@
  * - $block->region: The block region embedding the current block.
  *
  * Helper variables:
- * - $block_zebra: Outputs 'odd' and 'even' dependent on the default sidebar
- *   block regions.
+ * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
  * - $zebra: Same output as $block_zebra but independent of any block region.
- * - $block_id: counter within the default sidebar block regions.
+ * - $block_id: Counter dependent on each block region.
  * - $id: Same output as $block_id but independent of any block region.
  * - $is_front: Flags true when presented in the front page.
  * - $logged_in: Flags true when the current user is a logged-in member.
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index d6ee32686..1f50152ff 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -48,7 +48,7 @@
  *   the site, if they have been configured.
  *
  * Page content (in order of occurrance in the default page.tpl.php):
- * - $sidebar_left: The HTML for the left sidebar.
+ * - $left: The HTML for the left sidebar.
  *
  * - $breadcrumb: The breadcrumb trail for the current page.
  * - $title: The page title, for use in the actual HTML content.
@@ -59,11 +59,12 @@
  *
  * - $content: The main content of the current Drupal page.
  *
- * - $sidebar_right: The HTML for the right sidebar.
+ * - $right: The HTML for the right sidebar.
  *
  * Footer/closing data:
  * - $feed_icons: A string of all feed icons for the current page.
  * - $footer_message: The footer message as defined in the admin settings.
+ * - $footer : The footer region.
  * - $closure: Final closing markup from any modules that have altered the page.
  *   This variable should always be output last, after all other dynamic content.
  *
@@ -134,9 +135,9 @@
 
     <div id="container" class="clear-block">
 
-      <?php if (!empty($sidebar_left)): ?>
+      <?php if (!empty($left)): ?>
         <div id="sidebar-left" class="column sidebar">
-          <?php print $sidebar_left; ?>
+          <?php print $left; ?>
         </div> <!-- /sidebar-left -->
       <?php endif; ?>
 
@@ -157,9 +158,9 @@
 
       </div></div> <!-- /main-squeeze /main -->
 
-      <?php if (!empty($sidebar_right)): ?>
+      <?php if (!empty($right)): ?>
         <div id="sidebar-right" class="column sidebar">
-          <?php print $sidebar_right; ?>
+          <?php print $right; ?>
         </div> <!-- /sidebar-right -->
       <?php endif; ?>
 
@@ -168,6 +169,7 @@
     <div id="footer-wrapper">
       <div id="footer">
         <?php print $footer_message; ?>
+        <?php if (!empty($footer)): print $footer; endif; ?>
       </div> <!-- /footer -->
     </div> <!-- /footer-wrapper -->
 
-- 
cgit v1.2.3