diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-29 15:05:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-29 15:05:56 +0000 |
| commit | 69983a2d4ea6e59361751efdf4a0aed78edd6370 (patch) | |
| tree | 17d37bb161b1868602b4ba8a208b664538052e2f /phpBB/includes/ucp/ucp_register.php | |
| parent | 284cba438b4bca43352174ce97f5a455c229146c (diff) | |
| download | forums-69983a2d4ea6e59361751efdf4a0aed78edd6370.tar forums-69983a2d4ea6e59361751efdf4a0aed78edd6370.tar.gz forums-69983a2d4ea6e59361751efdf4a0aed78edd6370.tar.bz2 forums-69983a2d4ea6e59361751efdf4a0aed78edd6370.tar.xz forums-69983a2d4ea6e59361751efdf4a0aed78edd6370.zip | |
fixing bug #4078
git-svn-id: file:///svn/phpbb/trunk@6327 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_register.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 2a4e376f14..adfdb60ffe 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -322,10 +322,19 @@ class ucp_register { // Grab an array of user_id's with a_user permissions ... these users can activate a user $admin_ary = $auth->acl_get_list(false, 'a_user', false); + $admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array(); + + // Also include founders + $where_sql = ' WHERE user_type = ' . USER_FOUNDER; + + if (sizeof($admin_ary)) + { + $where_sql .= ' OR ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); + } $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); + FROM ' . USERS_TABLE . ' ' . + $where_sql; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -381,10 +390,13 @@ class ucp_register } while ($row = $db->sql_fetchrow($result)); - $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in, true) . ' - AND confirm_type = ' . CONFIRM_REG; - $db->sql_query($sql); + if (sizeof($sql_in)) + { + $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' + WHERE ' . $db->sql_in_set('session_id', $sql_in, true) . ' + AND confirm_type = ' . CONFIRM_REG; + $db->sql_query($sql); + } } $db->sql_freeresult($result); |