Mercurial > hg > cmmr2012-drupal-site
diff core/modules/user/src/Controller/UserController.php @ 5:12f9dff5fda9 tip
Update to Drupal core 8.7.1
author | Chris Cannam |
---|---|
date | Thu, 09 May 2019 15:34:47 +0100 |
parents | a9cd425dd02b |
children |
line wrap: on
line diff
--- a/core/modules/user/src/Controller/UserController.php Thu Feb 28 13:11:55 2019 +0000 +++ b/core/modules/user/src/Controller/UserController.php Thu May 09 15:34:47 2019 +0100 @@ -123,8 +123,8 @@ $this->messenger() ->addWarning($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href=":logout">log out</a> and try using the link again.', [ - '%other_user' => $account->getUsername(), - '%resetting_user' => $reset_link_user->getUsername(), + '%other_user' => $account->getAccountName(), + '%resetting_user' => $reset_link_user->getAccountName(), ':logout' => $this->url('user.logout'), ])); }