From 91d0c8b3bf41dfed42d8e33595c0e530a431db1c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 21 Apr 2008 15:10:59 +0000
Subject: merge again, revisions 8516 to 8525

git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/memberlist.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/memberlist.php')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index dc74290fad..bfa4e6eceb 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -894,7 +894,7 @@ switch ($mode)
 		{
 			$sort_key_sql['l'] = 'u.user_lastvisit';
 		}
-		$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']);
 
@@ -1154,6 +1154,12 @@ switch ($mode)
 
 		$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 ...
 		if ($sql_where)
 		{
-- 
cgit v1.2.1