From bfb8a7da0ff64d5453ebbf91d149ec5e52ee6524 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 6 Aug 2018 12:40:50 +0100
Subject: [PATCH] Issue #2746065 by Berdir, yogeshmpawar, hlykos, xeM8VfDh:
Profile page's title/heading does not fulfill hook_user_format_name_alter
---
core/modules/user/src/Controller/UserController.php | 2 +-
core/modules/user/tests/src/Functional/UserEditTest.php | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/modules/user/src/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php
index 2bbfe345e73c..09544aa63802 100644
--- a/core/modules/user/src/Controller/UserController.php
+++ b/core/modules/user/src/Controller/UserController.php
@@ -273,7 +273,7 @@ public function userPage() {
* NULL.
*/
public function userTitle(UserInterface $user = NULL) {
- return $user ? ['#markup' => $user->getUsername(), '#allowed_tags' => Xss::getHtmlTagList()] : '';
+ return $user ? ['#markup' => $user->getDisplayName(), '#allowed_tags' => Xss::getHtmlTagList()] : '';
}
/**
diff --git a/core/modules/user/tests/src/Functional/UserEditTest.php b/core/modules/user/tests/src/Functional/UserEditTest.php
index 0f75ff8dc580..5cdbc19f0506 100644
--- a/core/modules/user/tests/src/Functional/UserEditTest.php
+++ b/core/modules/user/tests/src/Functional/UserEditTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\user\Functional;
+use Drupal\Core\Cache\Cache;
use Drupal\Tests\BrowserTestBase;
/**
@@ -29,9 +30,15 @@ public function testUserEdit() {
// is the raw value and not a formatted one.
\Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
\Drupal::service('module_installer')->install(['user_hooks_test']);
+ Cache::invalidateTags(['rendered']);
$this->drupalGet('user/' . $user1->id() . '/edit');
$this->assertFieldByName('name', $user1->getAccountName());
+ // Ensure the formatted name is displayed when expected.
+ $this->drupalGet('user/' . $user1->id());
+ $this->assertSession()->responseContains($user1->getDisplayName());
+ $this->assertSession()->titleEquals(strip_tags($user1->getDisplayName()) . ' | Drupal');
+
// Check that filling out a single password field does not validate.
$edit = [];
$edit['pass[pass1]'] = '';
--
GitLab