? themes/nhpr
Index: themes/bluemarine/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/node.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 node.tpl.php
--- themes/bluemarine/node.tpl.php	6 Jun 2005 14:07:04 -0000	1.3
+++ themes/bluemarine/node.tpl.php	19 Jul 2005 14:13:45 -0000
@@ -1,5 +1,5 @@
   <div class="node<?php if ($sticky) { print " sticky"; } ?>">
-    <?php if ($picture) {
+    <?php if ($show_picture) {
       print $picture;
     }?>
     <?php if ($page == 0) { ?><h2 class="title"><a href="<?php print $node_url?>"><?php print $title?></a></h2><?php }; ?>
Index: themes/engines/phptemplate/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/node.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 node.tpl.php
--- themes/engines/phptemplate/node.tpl.php	4 May 2005 18:12:17 -0000	1.1
+++ themes/engines/phptemplate/node.tpl.php	19 Jul 2005 14:13:45 -0000
@@ -2,7 +2,7 @@
   <?php if ($page == 0): ?>
     <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   <?php endif; ?>
-  <?php print $picture ?>
+  <?php print $show_picture ? $picture : ''; ?>
 
   <div class="info"><?php print $submitted ?><span class="terms"><?php print $terms ?></span></div>
   <div class="content">
@@ -10,7 +10,7 @@
   </div>
 <?php if ($links): ?>
 
-    <?php if ($picture): ?>
+    <?php if ($show_picture): ?>
       <br class='clear' />
     <?php endif; ?>
     <div class="links"><?php print $links ?></div>
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.7
diff -u -r1.7 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	17 Jul 2005 19:59:00 -0000	1.7
+++ themes/engines/phptemplate/phptemplate.engine	19 Jul 2005 14:13:45 -0000
@@ -210,7 +210,8 @@
   // Display info only on certain node types.
   if (theme_get_setting('toggle_node_info_' . $node->type)) {
     $variables['submitted'] =  t('Submitted by %a on %b.', array('%a' => format_name($node), '%b' => format_date($node->created)));
-    $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
+    $variables['show_picture'] = theme_get_setting('toggle_node_user_picture');
+    $variables['picture'] = $variables['show_picture'] ? theme('user_picture', $node) : '';
   }
 
   return _phptemplate_callback('node', $variables, 'node-' . $node->type);
Index: themes/pushbutton/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/node.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 node.tpl.php
--- themes/pushbutton/node.tpl.php	5 May 2005 10:58:27 -0000	1.1
+++ themes/pushbutton/node.tpl.php	19 Jul 2005 14:13:45 -0000
@@ -1,5 +1,5 @@
 <div class="node<?php print ($sticky) ? " sticky" : ""; ?>">
-  <?php print $picture ?>
+  <?php print $show_picture ? $picture : ''; ?>
   <?php if ($page == 0): ?>
     <h1 class="title"><a href="<?php print $node_url ?>"><?php print $title ?></a></h1>
   <?php endif; ?>