aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-18 14:31:03 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-18 14:31:03 +0000
commit8b630499363f6eb53449167cc017ccea0654faa8 (patch)
tree7bec6353b83979e95f6a60d469e581154a9b7a89
parent5f7e847b57e78744d7559daddd53f107458d43cd (diff)
downloadforums-8b630499363f6eb53449167cc017ccea0654faa8.tar
forums-8b630499363f6eb53449167cc017ccea0654faa8.tar.gz
forums-8b630499363f6eb53449167cc017ccea0654faa8.tar.bz2
forums-8b630499363f6eb53449167cc017ccea0654faa8.tar.xz
forums-8b630499363f6eb53449167cc017ccea0654faa8.zip
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
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/search/fulltext_native.php9
2 files changed, 7 insertions, 3 deletions
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 @@
<li>[Fix] Do not allow setting forums parent to the forum itself. (Bug #18855)</li>
<li>[Fix] Display assigned rank/avatar for guests. (Bug #19155)</li>
<li>[Fix] Set secure cookie for style switcher if required. (Bug #19625)</li>
+ <li>[Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)</li>
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
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;