makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2016-01-23 12:04:43 +01:00
commit e28a5da457
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/memberlist.php
View file

@ -1231,21 +1231,19 @@ switch ($mode)
); );
extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_sql_query_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_sql_query_data', compact($vars)));
// Count the users ... $user_types = array(USER_NORMAL, USER_FOUNDER);
if ($sql_where) if ($auth->acl_get('a_user'))
{ {
$user_types[] = USER_INACTIVE;
}
// Count the users ...
$sql = 'SELECT COUNT(u.user_id) AS total_users $sql = 'SELECT COUNT(u.user_id) AS total_users
FROM ' . USERS_TABLE . " u$sql_from FROM ' . USERS_TABLE . " u$sql_from
WHERE u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ") WHERE " . $db->sql_in_set('u.user_type', $user_types) . "
$sql_where"; $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$total_users = (int) $db->sql_fetchfield('total_users'); $total_users = (int) $db->sql_fetchfield('total_users');
$db->sql_freeresult($result); $db->sql_freeresult($result);
}
else
{
$total_users = $config['num_users'];
}
// Build a relevant pagination_url // Build a relevant pagination_url
$params = $sort_params = array(); $params = $sort_params = array();
@ -1411,13 +1409,7 @@ switch ($mode)
); );
} }
$user_types = array(USER_NORMAL, USER_FOUNDER); $start = $pagination->validate_start($start, $config['topics_per_page'], $total_users);
if ($auth->acl_get('a_user'))
{
$user_types[] = USER_INACTIVE;
}
$start = $pagination->validate_start($start, $config['topics_per_page'], $config['num_users']);
// Get us some users :D // Get us some users :D
$sql = "SELECT u.user_id $sql = "SELECT u.user_id