? .completion.db
? .patch
? 350984.patch
? MyProject.kpf
? drnr.kpf
? drnr.tmproj
? files
? mw.patch
? tmp.patch
? sites/all/modules
? sites/default/files
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.458
diff -u -F^f -p -r1.458 theme.inc
--- includes/theme.inc	31 Dec 2008 12:02:21 -0000	1.458
+++ includes/theme.inc	3 Jan 2009 13:33:25 -0000
@@ -1983,7 +1983,7 @@ function template_preprocess_node(&$vari
   $variables['name']      = theme('username', $node);
   $variables['node_url']  = url('node/' . $node->nid);
   $variables['title']     = check_plain($node->title);
-  $variables['page']     = (bool)menu_get_object();
+  $variables['page']      = (bool)menu_get_object();
   
   if ($node->build_mode == NODE_BUILD_PREVIEW) {
     unset($node->content['links']);
@@ -1996,7 +1996,7 @@ function template_preprocess_node(&$vari
   $variables['links']     = !empty($node->content['links']) ? drupal_render($node->content['links']) : '';
   
   // Render any comments.
-  $variables['comments']     = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : '';
+  $variables['comments']  = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : '';
 
   // Render the rest of the node into $content.
   if (!empty($node->content['teaser'])) {
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.678
diff -u -F^f -p -r1.678 comment.module
--- modules/comment/comment.module	2 Jan 2009 21:17:35 -0000	1.678
+++ modules/comment/comment.module	3 Jan 2009 13:33:26 -0000
@@ -495,7 +495,7 @@ function comment_nodeapi_view($node, $te
     );
     
     // Append the list of comments to $node->content for node detail pages.
-    if ($node->comment && (bool)menu_get_object()) {
+    if ($node->comment && (bool)menu_get_object() && $node->build_mode != NODE_BUILD_PREVIEW) {
       $node->content['comments'] = array(
         '#markup' => comment_render($node),
       );
Index: modules/node/node.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.api.php,v
retrieving revision 1.6
diff -u -F^f -p -r1.6 node.api.php
--- modules/node/node.api.php	31 Dec 2008 12:02:22 -0000	1.6
+++ modules/node/node.api.php	3 Jan 2009 13:33:26 -0000
@@ -366,7 +366,7 @@ function hook_nodeapi_update_index($node
 }
 
 /**
- * The user has finished editing the node and is trying to preview or submit it. 
+ * The user has finished editing the node and is previewing or submitting it. 
  *
  * This hook can be used to check the node data. Errors should be set with 
  * form_set_error().
Index: themes/pushbutton/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/node.tpl.php,v
retrieving revision 1.5
diff -u -F^f -p -r1.5 node.tpl.php
--- themes/pushbutton/node.tpl.php	31 Dec 2008 12:02:24 -0000	1.5
+++ themes/pushbutton/node.tpl.php	3 Jan 2009 13:33:26 -0000
@@ -10,9 +10,9 @@
     <div class="taxonomy"><?php print $terms ?></div>
     <div class="content"><?php print $content ?></div>
     <?php if ($links): ?>
-    <div class="links">&raquo; <?php print $links ?></div>
+      <div class="links">&raquo; <?php print $links ?></div>
+    <?php endif; ?>
     
     <?php print $comments; ?>
       
-    <?php endif; ?>
 </div>