diff options
| author | Cullen Walsh <brainy@phpbb.com> | 2010-01-25 09:11:16 +0000 |
|---|---|---|
| committer | Cullen Walsh <brainy@phpbb.com> | 2010-01-25 09:11:16 +0000 |
| commit | fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4 (patch) | |
| tree | d41369ab8a76020db0c83608233dc8fa045afc95 /phpBB | |
| parent | 92e7b1e3df60d7a74c6cf490aff655125d012a81 (diff) | |
| download | forums-fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4.tar forums-fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4.tar.gz forums-fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4.tar.bz2 forums-fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4.tar.xz forums-fb96fcd90aa2b6e8ec61de0aaef58df2d2551db4.zip | |
[Fix] Don't send activation email when user tries to change email without permission (fix by nrohler). (Bug #56335)
Authorised by: naderman
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10438 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5198951f9a..12afc05043 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -141,6 +141,7 @@ <li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</li> <li>[Fix] Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2. (Bug #55045)</li> <li>[Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.</li> + <li>[Fix] Don't send activation email when user tries to change email without permission (fix by nrohler). (Bug #56335)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e24acd89fc..f4f4abad4a 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -133,7 +133,7 @@ class ucp_profile $message = 'PROFILE_UPDATED'; - if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN)) + if ($auth->acl_get('u_chgemail') && $config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN)) { $message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN'; |