--- comment_page.module.original	2008-10-29 19:52:49.000000000 -0400
+++ comment_page.module	2008-10-29 19:53:00.000000000 -0400
@@ -171,7 +171,7 @@
  */
 function comment_page_display($comment_id) {
   // Load up the comment.
-  $comment = _comment_load($comment_id);
+  $comment = _comment_load($comment_id->cid);
 
   // Check to make sure the user can access the node.
   $node = node_load($comment->nid);
@@ -183,6 +183,10 @@
   else {
     drupal_not_found();
   }
+  
+  $account = db_fetch_object(db_query("SELECT signature, picture FROM {users} WHERE uid = %d", $comment->uid));
+  $comment->picture = $account->picture;
+  $comment->signature = $account->signature;
 
   if (variable_get('default_comment_subject_on', TRUE) &&
       substr($comment->comment, 0, strlen($comment->subject)) == $comment->subject) {
@@ -200,7 +204,7 @@
   }
 
   // Build the output with the comment followed by the thread display.
-  $output = theme('comment_view', $comment,
+  $output = theme('comment_view', $comment, $node,
                   module_invoke_all('link', 'comment', $comment, 0));
 
   if (variable_get('comment_page_show_thread', TRUE)) {