summaryrefslogtreecommitdiff
path: root/modules/comment/comment.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-04-13 15:13:41 +0000
committerDries Buytaert <dries@buytaert.net>2010-04-13 15:13:41 +0000
commit06fe6cae2d7cf5ed663c3d1225206113f3b5824f (patch)
tree6e2dec1abd0adc8c779a5839ad60b04bbb93b224 /modules/comment/comment.module
parent906928c12acfd0c68b03a967473b4a0c4c1639cc (diff)
downloadbrdo-06fe6cae2d7cf5ed663c3d1225206113f3b5824f.tar.gz
brdo-06fe6cae2d7cf5ed663c3d1225206113f3b5824f.tar.bz2
- Patch #763048 by catch: critical bug: remove drupal_unpack()() due to namespacing collisions.
Diffstat (limited to 'modules/comment/comment.module')
-rw-r--r--modules/comment/comment.module3
1 files changed, 1 insertions, 2 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;