diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-11 16:49:04 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-11 16:49:04 +0100 |
| commit | d25b55b93a45bd279482fb767abdced3bb7538fb (patch) | |
| tree | 44b8e52a945c34dafc46564e4962e86a7b460488 | |
| parent | Merge pull request #5823 from JoshyPHP/ticket/16309 (diff) | |
| parent | [ticket/16308] Fix UCP reset password (diff) | |
| download | phpbb-d25b55b93a45bd279482fb767abdced3bb7538fb.tar.gz phpbb-d25b55b93a45bd279482fb767abdced3bb7538fb.tar.bz2 phpbb-d25b55b93a45bd279482fb767abdced3bb7538fb.zip | |
Merge pull request #5826 from 3D-I/ticket/16308
[ticket/16308] Fix UCP reset password
| -rw-r--r-- | phpBB/phpbb/ucp/controller/reset_password.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 5c27c4f414..d20fafb2a8 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -424,12 +424,8 @@ class reset_password } } - if (!empty($errors)) - { - $this->template->assign_block_vars_array('PASSWORD_RESET_ERRORS', array_map([$this->language, 'lang'], $errors)); - } - $this->template->assign_vars([ + 'PASSWORD_RESET_ERRORS' => !empty($errors) ? array_map([$this->language, 'lang'], $errors) : '', 'S_IS_PASSWORD_RESET' => true, 'U_RESET_PASSWORD_ACTION' => $this->helper->route('phpbb_ucp_reset_password_controller'), 'S_HIDDEN_FIELDS' => build_hidden_fields([ |