Merge 3d76a8bd09 into 1b2ac50cfd

PHPBB-17491

phpBB/phpbb/search/fulltext_mysql.php

@@ -832,6 +832,8 @@ class fulltext_mysql extends \phpbb\search\base
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT $sql_select
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
 				WHERE $sql_author

phpBB/phpbb/search/fulltext_native.php

@@ -1251,6 +1251,8 @@ class fulltext_native extends \phpbb\search\base
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT $select
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
 				WHERE $sql_author

phpBB/phpbb/search/fulltext_postgres.php

@@ -764,6 +764,8 @@ class fulltext_postgres extends \phpbb\search\base
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
 		{
+			// For sorting by non-unique columns, add unique sort key to avoid duplicated rows in results
+			$sql_sort .= ', p.post_id' . (($sort_dir == 'a') ? ' ASC' : ' DESC');
 			$sql = "SELECT p.post_id
 				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
 				WHERE $sql_author

tests/functional/search/base.php

@@ -311,7 +311,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 		);
 
 		// Browse the rest of search results pages with new sort direction
-		foreach (range(2, $last_page) as $page_number)
+		$pages = range(2, $last_page);
+		foreach ($pages as $page_number)
 		{
 			$crawler = self::$client->click($pagination->selectLink($page_number)->link());
 			$pagination = $crawler->filter('.pagination')->eq(0);