Issue #1058564 by Niklas Fiekas, droplet, grendzy, dixon_, naxoc: Fixed User picture does not appear in comment preview.

2 files changed, 9 insertions, 2 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index b69b3b481..aa512a700 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2064,6 +2064,7 @@ function comment_preview($comment) {
       $comment->name = check_plain($account->name);
       $comment->signature = $account->signature;
       $comment->signature_format = $account->signature_format;
+      $comment->picture = $account->picture;
     }
     elseif (empty($comment->name)) {
       $comment->name = variable_get('anonymous', t('Anonymous'));
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index 723e5c4b9..3c85b12bd 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -956,15 +956,18 @@ class CommentPreviewTest extends CommentHelperCase {
     $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.'));
     $this->drupalLogout();
 
-    // Login as web user and add a signature.
+    // Login as web user and add a signature and a user picture.
     $this->drupalLogin($this->web_user);
     variable_set('user_signatures', 1);
+    variable_set('user_pictures', 1);
     $test_signature = $this->randomName();
     $edit['signature[value]'] = '<a href="http://example.com/">' . $test_signature. '</a>';
     $edit['signature[format]'] = 'filtered_html';
+    $image = current($this->drupalGetTestFiles('image'));
+    $edit['files[picture_upload]'] = drupal_realpath($image->uri);
     $this->drupalPost('user/' . $this->web_user->uid . '/edit', $edit, t('Save'));
 
-    // Fill in the comment form and preview the comment.
+    // As the web user, fill in the comment form and preview the comment.
     $edit = array();
     $edit['subject'] = $this->randomName(8);
     $edit['comment_body[' . $langcode . '][0][value]'] = $this->randomName(16);
@@ -981,6 +984,9 @@ class CommentPreviewTest extends CommentHelperCase {
 
     // Check that the signature is displaying with the correct text format.
     $this->assertLink($test_signature);
+
+    // Check that the user picture is displayed.
+    $this->assertFieldByXPath("//div[contains(@class, 'comment-preview')]//div[contains(@class, 'user-picture')]//img", NULL, 'User picture displayed.');
   }
 
   /**