diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-05-08 08:23:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-05-08 08:23:11 -0400 |
| commit | 88d4964f0ee56f3c9dadc67c8e62b055568e6898 (patch) | |
| tree | ad51b323b6e0586159c87a34d80eb46434666f63 /phpBB/includes/ucp | |
| parent | 1a062c506412f4046a336701c8d4d53d45eac954 (diff) | |
| parent | 284011ebf256bffb9544493c7b82f90eeff4ae39 (diff) | |
| download | forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.gz forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.bz2 forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.xz forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.zip | |
Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
[ticket/10325] move migration into a new file
[ticket/10325] fix acp language
[ticket/10325] use assert_response_success parts
[ticket/10325] fix language in acp and ucp
[ticket/10325] add assert_response_success in test
[ticket/10325] functional tests for forgot password functionality
[ticket/10325] add logout function in functional_test_case
[ticket/10325] fix language in acp and ucp
[ticket/10325] improve acp option language
[ticket/10325] fix language key
[ticket/10325] fix language variable
[ticket/10325] change language var
[ticket/10325] fix language
[ticket/10325] add new config value to database
[ticket/10325] trigger error if forgot password option disabled
[ticket/10325] add allow forgot password option in acp
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index 8a7ba5d0ca..ff7ab53736 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -29,6 +29,11 @@ class ucp_remind global $config, $phpbb_root_path, $phpEx; global $db, $user, $auth, $template; + if (!$config['allow_password_reset']) + { + trigger_error($user->lang('UCP_PASSWORD_RESET_DISABLED', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>')); + } + $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); $submit = (isset($_POST['submit'])) ? true : false; |