Merge branch '3.3.x'

marc1706 · marc1706 · commit 505811b2f468 · 2025-03-01T14:48:17.000Z
diff --git a/memberlist.php b/memberlist.php
@@ -1385,10 +1385,10 @@
 
 		$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')
+		// For sorting by non-unique columns (rank, posts) add unique sort key to avoid duplicated rows in results
+		if ($sort_key == 'm' || $sort_key == 'd')
 		{
-			$order_by .= ', u.user_posts DESC';
+			$order_by .= ', u.user_id ASC';
 		}
 
 		/**

Original file line number	Diff line number	Diff line change
`@@ -1385,10 +1385,10 @@`
`1385`	`1385`
`1386`	`1386`	`$order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');`
`1387`	`1387`
`1388`		`- // Unfortunately we must do this here for sorting by rank, else the sort order is applied wrongly`
`1389`		`- if ($sort_key == 'm')`
	`1388`	`+ // For sorting by non-unique columns (rank, posts) add unique sort key to avoid duplicated rows in results`
	`1389`	`+ if ($sort_key == 'm' \|\| $sort_key == 'd')`
`1390`	`1390`	`{`
`1391`		`- $order_by .= ', u.user_posts DESC';`
	`1391`	`+ $order_by .= ', u.user_id ASC';`
`1392`	`1392`	`}`
`1393`	`1393`
`1394`	`1394`	`/**`