diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-05-29 19:55:42 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-05-29 19:55:42 +0000 |
| commit | a7f57d0aa18c32f45b3eb030c550315fea908e59 (patch) | |
| tree | 80c6bea2a39287c86db0ec1c75cc036b63bebb70 | |
| parent | 928fc7be976cabd45770728a3d496778a030de1e (diff) | |
| download | forums-a7f57d0aa18c32f45b3eb030c550315fea908e59.tar forums-a7f57d0aa18c32f45b3eb030c550315fea908e59.tar.gz forums-a7f57d0aa18c32f45b3eb030c550315fea908e59.tar.bz2 forums-a7f57d0aa18c32f45b3eb030c550315fea908e59.tar.xz forums-a7f57d0aa18c32f45b3eb030c550315fea908e59.zip | |
Fix a regression in r9498, activation could really do with an overhaul :(
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9520 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 36ab8a0e9b..8debaabf31 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -58,7 +58,8 @@ class ucp_activate // Do not allow activating by non administrators when admin activation is on // Only activation type the user should be able to do is INACTIVE_REMIND - if ($user_row['user_inactive_reason'] != INACTIVE_REMIND && $config['require_activation'] == USER_ACTIVATION_ADMIN && !$auth->acl_get('a_user')) + // or activate a new password which is not an activation state :@ + if (!$user_row['user_newpasswd'] && $user_row['user_inactive_reason'] != INACTIVE_REMIND && $config['require_activation'] == USER_ACTIVATION_ADMIN && !$auth->acl_get('a_user')) { if (!$user->data['is_registered']) { |