aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-07 18:43:45 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-07 18:43:45 +0100
commit7e2136587a4d5f2f011189aca6f94ee6a780eaf1 (patch)
tree763217246e4df1f69d6612c0ed1397bc05fbec74 /phpBB/phpbb/search
parent182a96f2738316adcb292816a9ac8af0e0cb5866 (diff)
parent77b275181aeddf43e1077d06abce11a9722bb85a (diff)
downloadforums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.gz
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.bz2
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.tar.xz
forums-7e2136587a4d5f2f011189aca6f94ee6a780eaf1.zip
Merge branch 'prep-release-3.2.2' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/search')
-rw-r--r--phpBB/phpbb/search/fulltext_postgres.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php
index 4fe7e3b88d..6443342057 100644
--- a/phpBB/phpbb/search/fulltext_postgres.php
+++ b/phpBB/phpbb/search/fulltext_postgres.php
@@ -498,7 +498,7 @@ class fulltext_postgres extends \phpbb\search\base
);
extract($this->phpbb_dispatcher->trigger_event('core.search_postgres_keywords_main_query_before', compact($vars)));
- $sql_select = ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id';
+ $sql_select = ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id, ' . $sort_by_sql[$sort_key];
$sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
$field = ($type == 'posts') ? 'post_id' : 'topic_id';