diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-05-22 09:08:19 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-05-22 09:08:19 -0400 |
| commit | 5dbe8aa92b9e746962b43f9a24b10d7f9616d232 (patch) | |
| tree | 3a99baca5a9f27bb3914ef9ee082eb4d2d6d84fc /modules/comment | |
| parent | c88f2e0188e48f4c4adfb101d70733a0b27d4685 (diff) | |
| parent | 267b9c435c5d7266f4ce674b84d95bfe1f5a0920 (diff) | |
| download | brdo-5dbe8aa92b9e746962b43f9a24b10d7f9616d232.tar.gz brdo-5dbe8aa92b9e746962b43f9a24b10d7f9616d232.tar.bz2 | |
Merge branch '7.x' of git.drupal.org:project/drupal into 7.x
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/comment.module | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 836f2fed8..499adc847 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -986,8 +986,8 @@ function comment_build_content($comment, $node, $view_mode = 'full', $langcode = $comment->content = array(); // Build fields content. - field_attach_prepare_view('comment', array($comment->cid => $comment), $view_mode); - entity_prepare_view('comment', array($comment->cid => $comment)); + field_attach_prepare_view('comment', array($comment->cid => $comment), $view_mode, $langcode); + entity_prepare_view('comment', array($comment->cid => $comment), $langcode); $comment->content += field_attach_view('comment', $comment, $view_mode, $langcode); $comment->content['links'] = array( @@ -1089,8 +1089,8 @@ function comment_links($comment, $node) { * An array in the format expected by drupal_render(). */ function comment_view_multiple($comments, $node, $view_mode = 'full', $weight = 0, $langcode = NULL) { - field_attach_prepare_view('comment', $comments, $view_mode); - entity_prepare_view('comment', $comments); + field_attach_prepare_view('comment', $comments, $view_mode, $langcode); + entity_prepare_view('comment', $comments, $langcode); $build = array( '#sorted' => TRUE, |