diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-30 10:04:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-30 10:04:33 +0200 |
| commit | 27df46040fe66804be7a8097beecbdae8a319f43 (patch) | |
| tree | a08b18562ac332fe4e960e33fbfd23b5c79df181 /phpBB/memberlist.php | |
| parent | a9242bbf7be2aad680396f55aff839c99ea73595 (diff) | |
| parent | b22fbc91d16dffab688d94031066bf788cbb318d (diff) | |
| download | forums-27df46040fe66804be7a8097beecbdae8a319f43.tar forums-27df46040fe66804be7a8097beecbdae8a319f43.tar.gz forums-27df46040fe66804be7a8097beecbdae8a319f43.tar.bz2 forums-27df46040fe66804be7a8097beecbdae8a319f43.tar.xz forums-27df46040fe66804be7a8097beecbdae8a319f43.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 146ded0929..bfa28d8d11 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -93,6 +93,12 @@ $default_key = 'c'; $sort_key = $request->variable('sk', $default_key); $sort_dir = $request->variable('sd', 'a'); +$user_types = array(USER_NORMAL, USER_FOUNDER); +if ($auth->acl_get('a_user')) +{ + $user_types[] = USER_INACTIVE; +} + // What do you want to do today? ... oops, I think that line is taken ... switch ($mode) { @@ -834,7 +840,7 @@ switch ($mode) $sql = 'SELECT username, user_id, user_colour FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_type', array(USER_NORMAL, USER_FOUNDER)) . ' + WHERE ' . $db->sql_in_set('user_type', $user_types) . ' AND username_clean ' . $db->sql_like_expression(utf8_clean_string($username_chars) . $db->get_any_char()); $result = $db->sql_query_limit($sql, 10); $user_list = array(); @@ -1231,11 +1237,6 @@ switch ($mode) ); extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_sql_query_data', compact($vars))); - $user_types = array(USER_NORMAL, USER_FOUNDER); - if ($auth->acl_get('a_user')) - { - $user_types[] = USER_INACTIVE; - } // Count the users ... $sql = 'SELECT COUNT(u.user_id) AS total_users FROM ' . USERS_TABLE . " u$sql_from |