From 3a0f6b33720b1a939ec2f828bfefd31b6c51817f Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Wed, 13 Jan 2010 05:00:25 +0000 Subject: #636992 by catch, yched: Fixed Entity loading needs protection from infinite recursion. Prevents unnecessary user_load()s from RDF. --- modules/comment/comment.module | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/comment') diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 1f24e44eb..3bbc3d991 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -879,6 +879,7 @@ function comment_build_content($comment, $node, $view_mode = 'full') { // Build fields content. field_attach_prepare_view('comment', array($comment->cid => $comment), $view_mode); + entity_prepare_view('comment', array($comment->cid => $comment)); $comment->content += field_attach_view('comment', $comment, $view_mode); // Prior to Drupal 7, the comment body was a simple text variable, but with @@ -997,6 +998,7 @@ function comment_links($comment, $node) { */ function comment_view_multiple($comments, $node, $view_mode = 'full', $weight = 0) { field_attach_prepare_view('comment', $comments, $view_mode); + entity_prepare_view('comment', $comments); $build = array( '#sorted' => TRUE, -- cgit v1.2.3