Index: modules/comment/comment-wrapper.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment-wrapper.tpl.php,v
retrieving revision 1.10
diff -u -p -r1.10 comment-wrapper.tpl.php
--- modules/comment/comment-wrapper.tpl.php	5 May 2010 06:41:22 -0000	1.10
+++ modules/comment/comment-wrapper.tpl.php	16 Nov 2010 22:16:47 -0000
@@ -37,16 +37,16 @@
  */
 ?>
 <div id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
-  <?php if ($content['comments'] && $node->type != 'forum'): ?>
+  <?php if ($comments = render($content['comments']) && $node->type != 'forum'): ?>
     <?php print render($title_prefix); ?>
     <h2 class="title"><?php print t('Comments'); ?></h2>
     <?php print render($title_suffix); ?>
   <?php endif; ?>
 
-  <?php print render($content['comments']); ?>
+  <?php print $comments; ?>
 
-  <?php if ($content['comment_form']): ?>
+  <?php if ($comment_form = render($content['comment_form'])): ?>
     <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
-    <?php print render($content['comment_form']); ?>
+    <?php print $comment_form; ?>
   <?php endif; ?>
 </div>
Index: modules/overlay/overlay.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/overlay/overlay.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 overlay.tpl.php
--- modules/overlay/overlay.tpl.php	6 Nov 2010 00:18:24 -0000	1.5
+++ modules/overlay/overlay.tpl.php	16 Nov 2010 22:16:48 -0000
@@ -30,7 +30,7 @@
     <div id="overlay-close-wrapper">
       <a id="overlay-close" href="#" class="overlay-close"><span class="element-invisible"><?php print t('Close overlay'); ?></span></a>
     </div>
-    <?php if ($tabs): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul id="overlay-tabs"><?php print render($tabs); ?></ul><?php endif; ?>
+    <?php if ($tabs = render($tabs)): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul id="overlay-tabs"><?php print $tabs; ?></ul><?php endif; ?>
   </div>
   <div id="overlay-content"<?php print $content_attributes; ?>>
     <?php print $page; ?>
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.47
diff -u -p -r1.47 page.tpl.php
--- modules/system/page.tpl.php	5 Nov 2010 01:25:33 -0000	1.47
+++ modules/system/page.tpl.php	16 Nov 2010 22:16:48 -0000
@@ -118,27 +118,27 @@
     <div id="main-wrapper"><div id="main" class="clearfix">
 
       <div id="content" class="column"><div class="section">
-        <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+        <?php if ($highlighted = render($page['highlighted'])): ?><div id="highlighted"><?php print $highlighted; ?></div><?php endif; ?>
         <a id="main-content"></a>
         <?php print render($title_prefix); ?>
         <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
         <?php print render($title_suffix); ?>
-        <?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
+        <?php if ($tabs = render($tabs)): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
         <?php print render($page['help']); ?>
-        <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+        <?php if ($action_links = render($action_links)): ?><ul class="action-links"><?php print $action_links; ?></ul><?php endif; ?>
         <?php print render($page['content']); ?>
         <?php print $feed_icons; ?>
       </div></div> <!-- /.section, /#content -->
 
-      <?php if ($page['sidebar_first']): ?>
+      <?php if ($sidebar_first = render($page['sidebar_first'])): ?>
         <div id="sidebar-first" class="column sidebar"><div class="section">
-          <?php print render($page['sidebar_first']); ?>
+          <?php print $sidebar_first; ?>
         </div></div> <!-- /.section, /#sidebar-first -->
       <?php endif; ?>
 
-      <?php if ($page['sidebar_second']): ?>
+      <?php if ($sidebar_second = render($page['sidebar_second'])): ?>
         <div id="sidebar-second" class="column sidebar"><div class="section">
-          <?php print render($page['sidebar_second']); ?>
+          <?php print $sidebar_second; ?>
         </div></div> <!-- /.section, /#sidebar-second -->
       <?php endif; ?>
 
Index: modules/toolbar/toolbar.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.tpl.php,v
retrieving revision 1.11
diff -u -p -r1.11 toolbar.tpl.php
--- modules/toolbar/toolbar.tpl.php	23 May 2010 18:23:32 -0000	1.11
+++ modules/toolbar/toolbar.tpl.php	16 Nov 2010 22:16:49 -0000
@@ -27,12 +27,12 @@
     <?php print render($toolbar['toolbar_home']); ?>
     <?php print render($toolbar['toolbar_user']); ?>
     <?php print render($toolbar['toolbar_menu']); ?>
-    <?php if ($toolbar['toolbar_drawer']):?>
+    <?php if ($toolbar_drawer = render($toolbar['toolbar_drawer'])):?>
       <?php print render($toolbar['toolbar_toggle']); ?>
     <?php endif; ?>
   </div>
 
   <div class="<?php echo $toolbar['toolbar_drawer_classes']; ?>">
-    <?php print render($toolbar['toolbar_drawer']); ?>
+    <?php print $toolbar_drawer; ?>
   </div>
 </div>
Index: themes/bartik/templates/comment-wrapper.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/comment-wrapper.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 comment-wrapper.tpl.php
--- themes/bartik/templates/comment-wrapper.tpl.php	25 Sep 2010 02:05:51 -0000	1.2
+++ themes/bartik/templates/comment-wrapper.tpl.php	16 Nov 2010 22:16:49 -0000
@@ -37,16 +37,16 @@
  */
 ?>
 <div id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
-  <?php if ($content['comments'] && $node->type != 'forum'): ?>
+  <?php if ($comments = render($content['comments']) && $node->type != 'forum'): ?>
     <?php print render($title_prefix); ?>
     <h2 class="title"><?php print t('Comments'); ?></h2>
     <?php print render($title_suffix); ?>
   <?php endif; ?>
 
-  <?php print render($content['comments']); ?>
+  <?php print $comments; ?>
 
-  <?php if ($content['comment_form']): ?>
+  <?php if ($comment_form = render($content['comment_form'])): ?>
     <h2 class="title comment-form"><?php print t('Add new comment'); ?></h2>
-    <?php print render($content['comment_form']); ?>
+    <?php print $comment_form; ?>
   <?php endif; ?>
 </div>
Index: themes/bartik/templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/node.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 node.tpl.php
--- themes/bartik/templates/node.tpl.php	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/templates/node.tpl.php	16 Nov 2010 22:16:49 -0000
@@ -113,8 +113,7 @@
       unset($content['links']['comment']['#links']['comment-add']);
     }
     // Only display the wrapper div if there are links.
-    $links = render($content['links']);
-    if ($links):
+    if ($links = render($content['links'])):
   ?>
     <div class="link-wrapper">
       <?php print $links; ?>
Index: themes/bartik/templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v
retrieving revision 1.9
diff -u -p -r1.9 page.tpl.php
--- themes/bartik/templates/page.tpl.php	7 Nov 2010 21:48:56 -0000	1.9
+++ themes/bartik/templates/page.tpl.php	16 Nov 2010 22:16:50 -0000
@@ -165,9 +165,9 @@
     </div></div> <!-- /.section, /#messages -->
   <?php endif; ?>
 
-  <?php if ($page['featured']): ?>
+  <?php if ($featured = render($page['featured'])): ?>
     <div id="featured"><div class="section clearfix">
-      <?php print render($page['featured']); ?>
+      <?php print $featured; ?>
     </div></div> <!-- /.section, /#featured -->
   <?php endif; ?>
 
@@ -177,14 +177,14 @@
       <div id="breadcrumb"><?php print $breadcrumb; ?></div>
     <?php endif; ?>
 
-    <?php if ($page['sidebar_first']): ?>
+    <?php if ($sidebar_first = render($page['sidebar_first'])): ?>
       <div id="sidebar-first" class="column sidebar"><div class="section">
-        <?php print render($page['sidebar_first']); ?>
+        <?php print $sidebar_first; ?>
       </div></div> <!-- /.section, /#sidebar-first -->
     <?php endif; ?>
 
     <div id="content" class="column"><div class="section">
-      <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+      <?php if ($highlighted = render($page['highlighted'])): ?><div id="highlighted"><?php print $highlighted; ?></div><?php endif; ?>
       <a id="main-content"></a>
       <?php print render($title_prefix); ?>
       <?php if ($title): ?>
@@ -193,15 +193,15 @@
         </h1>
       <?php endif; ?>
       <?php print render($title_suffix); ?>
-      <?php if ($tabs): ?>
+      <?php if ($tabs = render($tabs)): ?>
         <div class="tabs">
-          <?php print render($tabs); ?>
+          <?php print $tabs; ?>
         </div>
       <?php endif; ?>
       <?php print render($page['help']); ?>
-      <?php if ($action_links): ?>
+      <?php if ($action_links = render($action_links)): ?>
         <ul class="action-links">
-          <?php print render($action_links); ?>
+          <?php print $action_links; ?>
         </ul>
       <?php endif; ?>
       <?php print render($page['content']); ?>
@@ -209,36 +209,41 @@
 
     </div></div> <!-- /.section, /#content -->
 
-    <?php if ($page['sidebar_second']): ?>
+    <?php if ($sidebar_second = render($page['sidebar_second'])): ?>
       <div id="sidebar-second" class="column sidebar"><div class="section">
-        <?php print render($page['sidebar_second']); ?>
+        <?php print $sidebar_second; ?>
       </div></div> <!-- /.section, /#sidebar-second -->
     <?php endif; ?>
 
   </div></div> <!-- /#main, /#main-wrapper -->
 
-  <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?>
+  <?php if ($triptych_first = render($page['triptych_first'])
+            || $triptych_middle = render($page['triptych_middle'])
+            || $triptych_last = render($page['triptych_last'])): ?>
     <div id="triptych-wrapper"><div id="triptych" class="clearfix">
-      <?php print render($page['triptych_first']); ?>
-      <?php print render($page['triptych_middle']); ?>
-      <?php print render($page['triptych_last']); ?>
+      <?php print $triptych_first; ?>
+      <?php print $triptych_middle; ?>
+      <?php print $triptych_last; ?>
     </div></div> <!-- /#triptych, /#triptych-wrapper -->
   <?php endif; ?>
 
   <div id="footer-wrapper"><div class="section">
 
-    <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?>
+    <?php if ($footer_firstcolumn = render($page['footer_firstcolumn'])
+              || $footer_secondcolumn = render($page['footer_secondcolumn'])
+              || $footer_thirdcolumn = render($page['footer_thirdcolumn'])
+              || $footer_fourthcolumn = render($page['footer_fourthcolumn'])): ?>
       <div id="footer-columns" class="clearfix">
-        <?php print render($page['footer_firstcolumn']); ?>
-        <?php print render($page['footer_secondcolumn']); ?>
-        <?php print render($page['footer_thirdcolumn']); ?>
-        <?php print render($page['footer_fourthcolumn']); ?>
+        <?php print $footer_firstcolumn; ?>
+        <?php print $footer_secondcolumn; ?>
+        <?php print $footer_thirdcolumn; ?>
+        <?php print $footer_fourthcolumn; ?>
       </div> <!-- /#footer-columns -->
     <?php endif; ?>
 
-    <?php if ($page['footer']): ?>
+    <?php if ($footer = render($page['footer'])): ?>
       <div id="footer" class="clearfix">
-        <?php print render($page['footer']); ?>
+        <?php print $footer; ?>
       </div> <!-- /#footer -->
     <?php endif; ?>
 
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.23
diff -u -p -r1.23 node.tpl.php
--- themes/garland/node.tpl.php	8 Apr 2010 18:26:42 -0000	1.23
+++ themes/garland/node.tpl.php	16 Nov 2010 22:16:50 -0000
@@ -25,8 +25,8 @@
   </div>
 
   <div class="clearfix">
-    <?php if (!empty($content['links'])): ?>
-      <div class="links"><?php print render($content['links']); ?></div>
+    <?php if ($links = render($content['links'])): ?>
+      <div class="links"><?php print $links; ?></div>
     <?php endif; ?>
 
     <?php print render($content['comments']); ?>
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.47
diff -u -p -r1.47 page.tpl.php
--- themes/garland/page.tpl.php	16 Sep 2010 19:47:45 -0000	1.47
+++ themes/garland/page.tpl.php	16 Nov 2010 22:16:50 -0000
@@ -31,27 +31,27 @@
         <?php if ($secondary_nav): print $secondary_nav; endif; ?>
       </div> <!-- /#header -->
 
-      <?php if ($page['sidebar_first']): ?>
+      <?php if ($sidebar_first = render($page['sidebar_first'])): ?>
         <div id="sidebar-first" class="sidebar">
-          <?php print render($page['sidebar_first']); ?>
+          <?php print $sidebar_first; ?>
         </div>
       <?php endif; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
           <?php print $breadcrumb; ?>
-          <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+          <?php if ($highlighted = render($page['highlighted'])): ?><div id="highlighted"><?php print $highlighted; ?></div><?php endif; ?>
           <a id="main-content"></a>
           <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
           <?php print render($title_prefix); ?>
           <?php if ($title): ?>
-            <h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
+            <h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title; ?></h1>
           <?php endif; ?>
           <?php print render($title_suffix); ?>
-          <?php if ($tabs): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul class="tabs primary"><?php print render($tabs) ?></ul></div><?php endif; ?>
-          <?php if ($tabs2): ?><h2 class="element-invisible"><?php print t('Secondary tabs'); ?></h2><ul class="tabs secondary"><?php print render($tabs2) ?></ul><?php endif; ?>
+          <?php if ($tabs = render($tabs)): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul class="tabs primary"><?php print $tabs; ?></ul></div><?php endif; ?>
+          <?php if ($tabs2 = render($tabs2)): ?><h2 class="element-invisible"><?php print t('Secondary tabs'); ?></h2><ul class="tabs secondary"><?php print $tabs2; ?></ul><?php endif; ?>
           <?php print $messages; ?>
           <?php print render($page['help']); ?>
-          <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+          <?php if ($action_links = render($action_links)): ?><ul class="action-links"><?php print $action_links; ?></ul><?php endif; ?>
           <div class="clearfix">
             <?php print render($page['content']); ?>
           </div>
@@ -59,9 +59,9 @@
           <?php print render($page['footer']); ?>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
 
-      <?php if ($page['sidebar_second']): ?>
+      <?php if ($sidebar_second = render($page['sidebar_second'])): ?>
         <div id="sidebar-second" class="sidebar">
-          <?php print render($page['sidebar_second']); ?>
+          <?php print $sidebar_second; ?>
         </div>
       <?php endif; ?>
 
Index: themes/seven/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/page.tpl.php,v
retrieving revision 1.14
diff -u -p -r1.14 page.tpl.php
--- themes/seven/page.tpl.php	5 Oct 2010 00:29:14 -0000	1.14
+++ themes/seven/page.tpl.php	16 Nov 2010 22:16:50 -0000
@@ -8,16 +8,16 @@
       <h1 class="page-title"><?php print $title; ?></h1>
     <?php endif; ?>
     <?php print render($title_suffix); ?>
-    <?php if ($primary_local_tasks): ?>
+    <?php if ($primary_local_tasks = render($primary_local_tasks)): ?>
       <h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2>
-      <ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul>
+      <ul class="tabs primary"><?php print $primary_local_tasks; ?></ul>
     <?php endif; ?>
   </div>
 
   <div id="page">
-    <?php if ($secondary_local_tasks): ?>
+    <?php if ($secondary_local_tasks = render($secondary_local_tasks)): ?>
       <h2 class="element-invisible"><?php print t('Secondary tabs'); ?></h2>
-      <ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul>
+      <ul class="tabs secondary"><?php print $secondary_local_tasks; ?></ul>
     <?php endif; ?>
 
     <div id="content" class="clearfix">
@@ -25,12 +25,12 @@
       <?php if ($messages): ?>
         <div id="console" class="clearfix"><?php print $messages; ?></div>
       <?php endif; ?>
-      <?php if ($page['help']): ?>
+      <?php if ($help = render($page['help'])): ?>
         <div id="help">
-          <?php print render($page['help']); ?>
+          <?php print $help; ?>
         </div>
       <?php endif; ?>
-      <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+      <?php if ($action_links = render($action_links)): ?><ul class="action-links"><?php print $action_links; ?></ul><?php endif; ?>
       <?php print render($page['content']); ?>
     </div>