#371327 by quicksketch: Fix user picture rendering (with fixed tests).

2 files changed, 5 insertions, 4 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index b430121d4..bee3dfb78 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -767,7 +767,7 @@ function user_elements() {
  */
 function user_user_view(&$edit, &$account, $category = NULL) {
   $account->content['user_picture'] = array(
-    '#value' => theme('user_picture', $account),
+    '#markup' => theme('user_picture', $account),
     '#weight' => -10,
   );
   if (!isset($account->content['summary'])) {
diff --git a/modules/user/user.test b/modules/user/user.test
index 327068f5b..89c534a26 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -548,7 +548,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
         $text = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', array('%dimensions' => $test_dim));
         $this->assertRaw($text, t('Image was resized.'));
         $alt = t("@user's picture", array('@user' => $this->user->name));
-        $this->assertRaw(theme('image', $pic_path, $alt, $alt, '', FALSE), t("Image is displayed in user's profile page"));
+        $this->assertRaw(theme('image', $pic_path, $alt, $alt, '', FALSE), t("Image is displayed in user's edit page"));
 
         // Check if file is located in proper directory.
         $this->assertTrue(is_file($pic_path), t("File is located in proper directory"));
@@ -678,10 +678,11 @@ class UserPictureTestCase extends DrupalWebTestCase {
 
       $pic_path = $this->saveUserPicture($image);
 
-      // check if image is displayed in user's profile page
+      // Check if image is displayed in user's profile page.
+      $this->drupalGet('user');
       $this->assertRaw($pic_path, t("Image is displayed in user's profile page"));
 
-      // check if file is located in proper directory
+      // Check if file is located in proper directory.
       $this->assertTrue(is_file($pic_path), t('File is located in proper directory'));
     }
   }