--- 1968348-hook_entity_view_mode_alter-major-errors-7.diff	2013-04-15 22:25:21.000000000 +0200
+++ 1968348-hook_entity_view_mode_alter-major-errors-10.diff	2013-04-18 09:55:03.860844047 +0200
@@ -124,9 +124,20 @@
    foreach ($nodes as $node) {
      $build['nodes'][$node->nid] = node_view($node, $view_mode, $langcode);
 diff --git a/modules/node/node.test b/modules/node/node.test
-index 0256fec..d81d26d 100644
+index 0256fec..feff883 100644
 --- a/modules/node/node.test
 +++ b/modules/node/node.test
+@@ -2678,8 +2678,8 @@ class NodeEntityViewModeAlterTest extends NodeWebTestCase {
+     $edit = array();
+     $langcode = LANGUAGE_NONE;
+     $edit["title"] = $this->randomName(8);
+-    $edit["body[$langcode][0][value]"] = t('Data that should appear only in the body for the node.');
+-    $edit["body[$langcode][0][summary]"] = t('Extra data that should appear only in the teaser for the node.');
++    $edit["body[$langcode][0][value]"] = 'Data that should appear only in the body for the node.';
++    $edit["body[$langcode][0][summary]"] = 'Extra data that should appear only in the teaser for the node.';
+     $this->drupalPost('node/add/page', $edit, t('Save'));
+ 
+     $node = $this->drupalGetNodeByTitle($edit["title"]);
 @@ -2698,3 +2698,60 @@ class NodeEntityViewModeAlterTest extends NodeWebTestCase {
      $this->assertEqual($build['#view_mode'], 'teaser', 'The view mode has correctly been set to teaser.');
    }
@@ -165,8 +176,8 @@
 +    $edit = array();
 +    $langcode = LANGUAGE_NONE;
 +    $edit["title"] = $this->randomName(8);
-+    $edit["body[$langcode][0][value]"] = t('Data that should appear only in the body for the node.');
-+    $edit["body[$langcode][0][summary]"] = t('Extra data that should appear only in the teaser for the node.');
++    $edit["body[$langcode][0][value]"] = 'Data that should appear only in the body for the node.';
++    $edit["body[$langcode][0][summary]"] = 'Extra data that should appear only in the teaser for the node.';
 +    $edit["field_tags[$langcode]"] = 'Extra tag';
 +    $this->drupalPost('node/add/article', $edit, t('Save'));
 +
@@ -221,7 +232,7 @@
    // Add the term description if the term has one and it is visible.
    $type = 'taxonomy_term';
 diff --git a/modules/user/user.module b/modules/user/user.module
-index bff6f76..7483131 100644
+index e8bcbc5..c801818 100644
 --- a/modules/user/user.module
 +++ b/modules/user/user.module
 @@ -2596,12 +2596,7 @@ function user_build_content($account, $view_mode = 'full', $langcode = NULL) {