makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-01-11 16:49:12 +01:00
commit c2505ade2a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/ucp/controller/reset_password.php
View file

@ -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([ $this->template->assign_vars([
'PASSWORD_RESET_ERRORS' => !empty($errors) ? array_map([$this->language, 'lang'], $errors) : '',
'S_IS_PASSWORD_RESET' => true, 'S_IS_PASSWORD_RESET' => true,
'U_RESET_PASSWORD_ACTION' => $this->helper->route('phpbb_ucp_reset_password_controller'), 'U_RESET_PASSWORD_ACTION' => $this->helper->route('phpbb_ucp_reset_password_controller'),
'S_HIDDEN_FIELDS' => build_hidden_fields([ 'S_HIDDEN_FIELDS' => build_hidden_fields([