Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.522
diff -u -p -r1.522 comment.module
--- modules/comment/comment.module	24 Jan 2007 14:48:36 -0000	1.522
+++ modules/comment/comment.module	25 Jan 2007 22:38:58 -0000
@@ -206,7 +206,7 @@ function comment_menu() {
   $items['node/%/%'] = array(
     'title' => t('View'),
     'page callback' => 'node_page_view',
-    'page arguments' => array(1, 2),
+    'page arguments' => array(1),
     'access callback' => '_comment_view_access',
     'access arguments' => array(1, 2),
     'type' => MENU_CALLBACK,
@@ -409,7 +409,7 @@ function comment_form_alter($form_id, &$
  * Implementation of hook_nodeapi().
  *
  */
-function comment_nodeapi(&$node, $op, $arg = 0) {
+function comment_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
     case 'load':
       return db_fetch_array(db_query("SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = %d", $node->nid));
@@ -449,6 +449,16 @@ function comment_nodeapi(&$node, $op, $a
       else {
         return array();
       }
+    
+    case 'view':
+      // If node has comments enabled, and $page == TRUE, add comments to body.
+      if ($node->comment && $a4) {
+        $node->content['comments'] = array(
+          '#value' => comment_render($node),
+          '#weight' => 10,
+        );
+      }
+      break;
   }
 }
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.778
diff -u -p -r1.778 node.module
--- modules/node/node.module	25 Jan 2007 21:32:07 -0000	1.778
+++ modules/node/node.module	25 Jan 2007 22:39:00 -0000
@@ -758,13 +758,9 @@ function node_build_content($node, $teas
 /**
  * Generate a page displaying a single node, along with its comments.
  */
-function node_show($node, $cid) {
+function node_show($node) {
   $output = node_view($node, FALSE, TRUE);
 
-  if (function_exists('comment_render') && $node->comment) {
-    $output .= comment_render($node, $cid);
-  }
-
   // Update the history table, stating that this user viewed this node.
   node_tag_new($node->nid);
 
@@ -2319,7 +2315,7 @@ function node_revisions() {
           if ($node->nid) {
             if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) {
               drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))));
-              return node_show($node, arg(2));
+              return node_show($node);
             }
             drupal_access_denied();
             return;
@@ -2383,7 +2379,7 @@ function node_page_default() {
  */
 function node_page_view($node, $cid = NULL) {
   drupal_set_title(check_plain($node->title));
-  return node_show($node, $cid);
+  return node_show($node);
 }
 
 /**