diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:00:25 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:00:25 +0000 |
| commit | 3a0f6b33720b1a939ec2f828bfefd31b6c51817f (patch) | |
| tree | 89502c07e46b8eb5367aa880c74a15204c95c2cc /modules/comment | |
| parent | 52f99dc071428a1490d0d367e95706a65f5b3d17 (diff) | |
| download | brdo-3a0f6b33720b1a939ec2f828bfefd31b6c51817f.tar.gz brdo-3a0f6b33720b1a939ec2f828bfefd31b6c51817f.tar.bz2 | |
#636992 by catch, yched: Fixed Entity loading needs protection from infinite recursion. Prevents unnecessary user_load()s from RDF.
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/comment.module | 2 |
1 files changed, 2 insertions, 0 deletions
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, |