mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 06:18:52 +00:00
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8524 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
89474a8e3a
commit
2c2da40f1b
2 changed files with 8 additions and 1 deletions
|
@ -100,6 +100,7 @@
|
||||||
<li>[Fix] Do not return BMP as valid image type for GD image manipulation (Bug #25925)</li>
|
<li>[Fix] Do not return BMP as valid image type for GD image manipulation (Bug #25925)</li>
|
||||||
<li>[Change] For determining the maximum number of private messages in one box, use the biggest value from all groups the user is a member of (Bug #24665)</li>
|
<li>[Change] For determining the maximum number of private messages in one box, use the biggest value from all groups the user is a member of (Bug #24665)</li>
|
||||||
<li>[Fix] Correctly determine safe mode for temp file creation in functions_upload.php (Bug #23525)</li>
|
<li>[Fix] Correctly determine safe mode for temp file creation in functions_upload.php (Bug #23525)</li>
|
||||||
|
<li>[Fix] Correctly sort by rank in memberlist (Bug #24435)</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>
|
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>
|
||||||
|
|
|
@ -896,7 +896,7 @@ switch ($mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
$sort_key_text['m'] = $user->lang['SORT_RANK'];
|
$sort_key_text['m'] = $user->lang['SORT_RANK'];
|
||||||
$sort_key_sql['m'] = 'u.user_rank DESC, u.user_posts';
|
$sort_key_sql['m'] = 'u.user_rank';
|
||||||
|
|
||||||
$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
|
$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
|
||||||
|
|
||||||
|
@ -1156,6 +1156,12 @@ switch ($mode)
|
||||||
|
|
||||||
$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
|
$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
|
||||||
|
|
||||||
|
// Unfortunately we must do this here for sorting by rank, else the sort order is applied wrongly
|
||||||
|
if ($sort_key == 'm')
|
||||||
|
{
|
||||||
|
$order_by .= ', u.user_posts DESC';
|
||||||
|
}
|
||||||
|
|
||||||
// Count the users ...
|
// Count the users ...
|
||||||
if ($sql_where)
|
if ($sql_where)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue