mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4137 from RMcGirr83/ticket_14427

Browse Source 
[ticket/14427] Memberlist displays inaccurate information
This commit is contained in:
Marc Alexander 2016-01-23 11:55:04 +01:00
commit 39538ecb85
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/memberlist.php
View File

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