diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:21:53 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:21:53 +0000 |
| commit | bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870 (patch) | |
| tree | f756a0d63fc3e659ea2954367e7ec27fda7957e5 /phpBB/includes/ucp/ucp_activate.php | |
| parent | 4a38e5cc3f19bb74bbcad70bd5f52ece9fea65cf (diff) | |
| download | forums-bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870.tar forums-bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870.tar.gz forums-bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870.tar.bz2 forums-bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870.tar.xz forums-bbfe3b0b7baaf9620b4f5faea7f2a3a801bec870.zip | |
37375
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9067 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 7de2511423..ad9dcc3659 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -51,7 +51,7 @@ class ucp_activate trigger_error('ALREADY_ACTIVATED'); } - if ($user_row['user_actkey'] != $key) + if (($user_row['user_inactive_reason'] == INACTIVE_MANUAL) || $user_row['user_actkey'] != $key) { trigger_error('WRONG_ACTIVATION'); } |