aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-09-01 11:36:57 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-01 11:36:57 +0200
commitf920336be4dcb3ae2df43c10dc8ef9ff1346ceb8 (patch)
treef9114e2beca6ae6b4de792c0ffd3e3cb579f2604
parent8048d817ca0198b214457066a549db6f92b85bc0 (diff)
downloadforums-f920336be4dcb3ae2df43c10dc8ef9ff1346ceb8.tar
forums-f920336be4dcb3ae2df43c10dc8ef9ff1346ceb8.tar.gz
forums-f920336be4dcb3ae2df43c10dc8ef9ff1346ceb8.tar.bz2
forums-f920336be4dcb3ae2df43c10dc8ef9ff1346ceb8.tar.xz
forums-f920336be4dcb3ae2df43c10dc8ef9ff1346ceb8.zip
[ticket/11327] Use http_exception instead of trigger_error
PHPBB3-11327
-rw-r--r--phpBB/phpbb/ucp/controller/reset_password.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php
index fb66ea1b99..d7b96c51c4 100644
--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -116,7 +116,10 @@ class reset_password
if (!$this->config['allow_password_reset'])
{
- trigger_error($this->language->lang('UCP_PASSWORD_RESET_DISABLED', '<a href="mailto:' . htmlspecialchars($this->config['board_contact']) . '">', '</a>'));
+ throw new http_exception(Response::HTTP_OK, 'UCP_PASSWORD_RESET_DISABLED', [
+ '<a href="mailto:' . htmlspecialchars($this->config['board_contact']) . '">',
+ '</a>'
+ ]);
}
}