diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:46:39 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:46:39 +0000 |
| commit | c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039 (patch) | |
| tree | da78de49cb18d372d5a3dfd336235b4e70ba6cee /phpBB/includes/ucp/ucp_activate.php | |
| parent | ef0c0d4c82dadfb856357f6ae906263420d84791 (diff) | |
| download | forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.gz forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.bz2 forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.xz forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.zip | |
Merge R 9067
git-svn-id: file:///svn/phpbb/trunk@9068 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 5db9fd5bd1..594e346310 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -50,7 +50,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'); } |