Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.36
diff -u -p -r1.36 comment.admin.inc
--- modules/comment/comment.admin.inc	3 Nov 2009 05:27:18 -0000	1.36
+++ modules/comment/comment.admin.inc	11 Nov 2009 19:47:43 -0000
@@ -72,26 +72,37 @@ function comment_admin_overview($form, &
   $query->addField('u', 'name', 'registered_name');
   $query->addField('n', 'title', 'node_title');
   $result = $query
-    ->fields('c', array('subject', 'nid', 'cid', 'comment', 'changed', 'status', 'name', 'homepage'))
+    ->fields('c', array('subject', 'nid', 'cid', 'changed', 'status', 'name', 'homepage'))
     ->fields('u', array('uid'))
     ->condition('c.status', $status)
     ->limit(50)
     ->orderByHeader($header)
     ->execute();
-
+    
+  // We need to load the comment object to get the comment_body field which is
+  // stored in its own table. To do this, get an array of cids.
+  foreach ($result as $comment) {
+    $comments[] = $comment;
+    $cid[] = $comment->cid;
+  }
+  $comment_objects = comment_load_multiple($cid);
 
   // Build a table listing the appropriate comments.
   $options = array();
   $destination = drupal_get_destination();
 
-  foreach ($result as $comment) {
+  foreach ($comments as $comment) {
+    // Retrieve the first comment object in the array and add the comment_body
+    // field to the result from the database query. 
+    $comment_object = array_shift($comment_objects);
+    $comment->comment_body = $comment_object->comment_body;
     $options[$comment->cid] = array(
       'subject' => array(
         'data' => array(
           '#type' => 'link',
           '#title' => $comment->subject,
           '#href' => 'comment/' . $comment->cid,
-          '#options' => array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid),
+          '#options' => array('attributes' => array('title' => truncate_utf8($comment->comment_body['zxx'][0]['value'], 128)), 'fragment' => 'comment-' . $comment->cid),
         ),
       ),
       'author' => theme('username', array('account' => $comment)),
@@ -160,7 +171,7 @@ function comment_admin_overview_submit($
         // Allow modules to respond to the updating of a comment.
         module_invoke_all('comment_' . $form_state['values']['operation'], $comment);
         // Add an entry to the watchdog log.
-        watchdog('content', 'Comment: updated %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)));
+        watchdog('content', 'Comment: updated %cid.', array('%cid' => $comment->cid), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)));
       }
     }
     cache_clear_all();
@@ -193,7 +204,7 @@ function comment_multiple_delete_confirm
     $comment = comment_load($cid);
     if (is_object($comment) && is_numeric($comment->cid)) {
       $subject = db_query('SELECT subject FROM {comment} WHERE cid = :cid', array(':cid' => $cid))->fetchField();
-      $form['comments'][$cid] = array('#type' => 'hidden', '#value' => $cid, '#prefix' => '<li>', '#suffix' => check_plain($subject) . '</li>');
+      $form['comments'][$cid] = array('#type' => 'hidden', '#value' => $cid);
       $comment_counter++;
     }
   }
@@ -235,7 +246,7 @@ function comment_confirm_delete($form, &
   $form['#comment'] = $comment;
   return confirm_form(
     $form,
-    t('Are you sure you want to delete the comment %title?', array('%title' => $comment->subject)),
+    t('Are you sure you want to delete the comment by %name', array('%name' => $comment->name)),
     'node/' . $comment->nid,
     t('Any replies to this comment will be lost. This action cannot be undone.'),
     t('Delete'),