- Patch #763048 by catch: critical bug: remove drupal_unpack()() due to namespacing collisions.

2 files changed, 1 insertions, 3 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index bd737b499..21c16949c 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1597,14 +1597,13 @@ class CommentController extends DrupalDefaultEntityController {
     $query->addField('n', 'type', 'node_type');
     $query->innerJoin('users', 'u', 'base.uid = u.uid');
     $query->addField('u', 'name', 'registered_name');
-    $query->fields('u', array('uid', 'signature', 'picture', 'data'));
+    $query->fields('u', array('uid', 'signature', 'picture'));
     return $query;
   }
 
   protected function attachLoad(&$comments, $revision_id = FALSE) {
     // Setup standard comment properties.
     foreach ($comments as $key => $comment) {
-      $comment = drupal_unpack($comment);
       $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
       $comment->new = node_mark($comment->nid, $comment->changed);
       $comment->node_type = 'comment_node_' . $comment->node_type;
diff --git a/modules/comment/comment.pages.inc b/modules/comment/comment.pages.inc
index 948fcad11..089825f56 100644
--- a/modules/comment/comment.pages.inc
+++ b/modules/comment/comment.pages.inc
@@ -61,7 +61,6 @@ function comment_reply($node, $pid = NULL) {
             drupal_goto("node/$node->nid");
           }
           // Display the parent comment
-          $comment = drupal_unpack($comment);
           $comment->node_type = 'comment_node_' . $node->type;
           field_attach_load('comment', array($comment->cid => $comment));
           $comment->name = $comment->uid ? $comment->registered_name : $comment->name;