Index: node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.409
diff -u -r1.409 node.module
--- node.module	12 Oct 2004 20:01:25 -0000	1.409
+++ node.module	15 Oct 2004 02:01:20 -0000
@@ -1451,7 +1454,7 @@
 
   // Temporary solution for backward compatibility.
   if (is_numeric($op)) {
-    $op = arg(2) ? arg(2) : 'view';
+    $op = arg(2) ? (is_numeric(arg(2)) ? 'view' : arg(2)) : 'view';
   }
 
   switch ($op) {
Index: comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.297
diff -u -r1.297 comment.module
--- comment.module	14 Oct 2004 15:28:24 -0000	1.297
+++ comment.module	15 Oct 2004 02:01:20 -0000
@@ -136,6 +136,12 @@
     $items[] = array('path' => 'comment', 'title' => t('reply to comment'),
       'callback' => 'comment_save_settings', 'access' => 1, 'type' => MENU_CALLBACK);
   }
+  else if ((arg(0) == 'node') && is_numeric(arg(1)) && is_numeric(arg(2))) {
+    $items[] = array('path' => ('node/'. arg(1) .'/'. arg(2)), 'title' => t('view'),
+      'callback' => 'node_page',
+      'access' => node_access('view', $node) && user_access('access comments'),
+      'type' => MENU_CALLBACK);
+  }
 
   return $items;
 }
@@ -1568,7 +1574,7 @@
 
 function theme_comment_folded($comment) {
   $output  = "<div class=\"comment-folded\">\n";
-  $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/view/'. $comment->cid, NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark') : '') .'</span> ';
+  $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/'. $comment->cid, NULL, NULL, "comment-$comment->cid") . ($comment->new ? ' '. theme('mark') : '') .'</span> ';
   $output .= '<span class="credit">'. t('by') .' '. format_name($comment) ."</span>\n";
   $output .= "</div>\n";
   return $output;