From 8b630499363f6eb53449167cc017ccea0654faa8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 18 Sep 2008 14:31:03 +0000 Subject: Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8878 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/search/fulltext_native.php | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'phpBB') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index add2b9505a..da403c5fbf 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -116,6 +116,7 @@
  • [Fix] Do not allow setting forums parent to the forum itself. (Bug #18855)
  • [Fix] Display assigned rank/avatar for guests. (Bug #19155)
  • [Fix] Set secure cookie for style switcher if required. (Bug #19625)
    • +
  • [Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)
  • [Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.
  • [Change] Display warning in ACP if config.php file is left writable.
    • diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index b0e95a1559..27c57c125e 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -447,11 +447,14 @@ class fulltext_native extends search_backend 'FROM' => array( SEARCH_WORDMATCH_TABLE => array(), SEARCH_WORDLIST_TABLE => array(), - POSTS_TABLE => 'p' +// POSTS_TABLE => 'p' ), - 'LEFT_JOIN' => array() + 'LEFT_JOIN' => array(array( + 'FROM' => array(POSTS_TABLE => 'p'), + 'ON' => 'm0.post_id = p.post_id', + )), ); - $sql_where[] = 'm0.post_id = p.post_id'; +// $sql_where[] = 'm0.post_id = p.post_id'; $title_match = ''; $group_by = true; -- cgit v1.2.1