diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 10:49:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 10:49:06 +0000 |
| commit | 9f82dec04b18813c060e5a090a149c1a2c140689 (patch) | |
| tree | efab7d5e9ce8166ff4bff69d180c82230c3df481 /phpBB/includes/ucp/ucp_activate.php | |
| parent | 331a549c42a74472d27dadbe213618a7b914a737 (diff) | |
| download | forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.gz forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.bz2 forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.xz forums-9f82dec04b18813c060e5a090a149c1a2c140689.zip | |
some changes/bugfixes
git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index e9fbe69938..6b17b28ba0 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -25,7 +25,7 @@ class ucp_activate $user_id = request_var('u', 0); $key = request_var('k', ''); - $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey + $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason FROM ' . USERS_TABLE . " WHERE user_id = $user_id"; $result = $db->sql_query($sql); @@ -101,7 +101,14 @@ class ucp_activate } else { - $message = (!$update_password) ? 'ACCOUNT_ACTIVE' : 'PASSWORD_ACTIVATED'; + if (!$update_password) + { + $message = ($user_row['user_inactive_reason'] == INACTIVE_PROFILE) ? 'ACCOUNT_ACTIVE_PROFILE' : 'ACCOUNT_ACTIVE'; + } + else + { + $message = 'PASSWORD_ACTIVATED'; + } } meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); |