From f9e4a5c9ec24b3454b703cdea604b4fca5c9e19c Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 13 Oct 2016 17:11:23 +0100
Subject: [PATCH] Issue #2453491 by olafkarsten, devpreview, mgifford, webflo:
Account form username
---
core/modules/user/src/AccountForm.php | 2 +-
core/modules/user/src/Tests/UserEditTest.php | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index dbdb08b8db04..64c829aa0e93 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -106,7 +106,7 @@ public function form(array $form, FormStateInterface $form_state) {
'autocapitalize' => 'off',
'spellcheck' => 'false',
),
- '#default_value' => (!$register ? $account->getUsername() : ''),
+ '#default_value' => (!$register ? $account->getAccountName() : ''),
'#access' => ($register || ($user->id() == $account->id() && $user->hasPermission('change own username')) || $admin),
);
diff --git a/core/modules/user/src/Tests/UserEditTest.php b/core/modules/user/src/Tests/UserEditTest.php
index 225b1944038d..5b34d2e028ca 100644
--- a/core/modules/user/src/Tests/UserEditTest.php
+++ b/core/modules/user/src/Tests/UserEditTest.php
@@ -25,6 +25,13 @@ function testUserEdit() {
$this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t('The username %name is already taken.', array('%name' => $edit['name'])));
+ // Check that the default value in user name field
+ // 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']);
+ $this->drupalGet('user/' . $user1->id() . '/edit');
+ $this->assertFieldByName('name', $user1->getAccountName());
+
// Check that filling out a single password field does not validate.
$edit = array();
$edit['pass[pass1]'] = '';
--
GitLab