Mercurial > hg > cmmr2012-drupal-site
comparison 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 |
comparison
equal
deleted
inserted
replaced
4:a9cd425dd02b | 5:12f9dff5fda9 |
---|---|
121 /** @var \Drupal\user\UserInterface $reset_link_user */ | 121 /** @var \Drupal\user\UserInterface $reset_link_user */ |
122 if ($reset_link_user = $this->userStorage->load($uid)) { | 122 if ($reset_link_user = $this->userStorage->load($uid)) { |
123 $this->messenger() | 123 $this->messenger() |
124 ->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.', | 124 ->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.', |
125 [ | 125 [ |
126 '%other_user' => $account->getUsername(), | 126 '%other_user' => $account->getAccountName(), |
127 '%resetting_user' => $reset_link_user->getUsername(), | 127 '%resetting_user' => $reset_link_user->getAccountName(), |
128 ':logout' => $this->url('user.logout'), | 128 ':logout' => $this->url('user.logout'), |
129 ])); | 129 ])); |
130 } | 130 } |
131 else { | 131 else { |
132 // Invalid one-time link specifies an unknown user. | 132 // Invalid one-time link specifies an unknown user. |