aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-18 17:46:34 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-18 17:46:34 +0000
commit59763841b3b871dbe378f61f98fc8dfb5faec76a (patch)
tree253a32a996262f0507633f362a3dee1ea29bc6c4
parenteb49218428ca3cab1776218951608bcf3aa4d944 (diff)
downloadforums-59763841b3b871dbe378f61f98fc8dfb5faec76a.tar
forums-59763841b3b871dbe378f61f98fc8dfb5faec76a.tar.gz
forums-59763841b3b871dbe378f61f98fc8dfb5faec76a.tar.bz2
forums-59763841b3b871dbe378f61f98fc8dfb5faec76a.tar.xz
forums-59763841b3b871dbe378f61f98fc8dfb5faec76a.zip
Search for 'topic title only' and 'first post' should work again for non-mysql dbms. (Bug #40605)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9473 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/search/fulltext_native.php8
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 81a85eb3ad..b0d1ee66be 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -143,6 +143,7 @@
<li>[Fix] Apply append_sid() to newest/latest post links in viewforum/search and UCP main module. (Bug #26815)</li>
<li>[Fix] Do not create thumbnail if thumbnail would've the same size as the original image. (Bug #30725)</li>
<li>[Fix] Ability to vote in poll is now required for the ability to change existing vote. (Bug #38925)</li>
+ <li>[Fix] Search for 'topic title only' and 'first post' should work again for non-mysql dbms. (Bug #40605)</li>
<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
<li>[Change] Add link to user profile in the MCP for user notes and warn user.</li>
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index fb4975d30b..8df5ddfbae 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -645,6 +645,14 @@ class fulltext_native extends search_backend
$sql = '';
$sql_array_count = $sql_array;
+ if ($left_join_topics)
+ {
+ $sql_array_count['LEFT_JOIN'][] = array(
+ 'FROM' => array(TOPICS_TABLE => 't'),
+ 'ON' => 'p.topic_id = t.topic_id'
+ );
+ }
+
switch ($db->sql_layer)
{
case 'mysql4':