aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-11-26 19:23:33 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-11-26 19:23:33 +0000
commit313648f07bb82bccb2101c8dd7be36c007f76038 (patch)
tree4aac7368445dbd6eb730be18af04ca3847ec599f /phpBB/includes/search
parent5a8fb00ff90e502a4253cf1a71d4146c6ba8cce7 (diff)
downloadforums-313648f07bb82bccb2101c8dd7be36c007f76038.tar
forums-313648f07bb82bccb2101c8dd7be36c007f76038.tar.gz
forums-313648f07bb82bccb2101c8dd7be36c007f76038.tar.bz2
forums-313648f07bb82bccb2101c8dd7be36c007f76038.tar.xz
forums-313648f07bb82bccb2101c8dd7be36c007f76038.zip
Bug #54325 - Fulltext-MySQL search for keywords and username at the same time. (Regression from r9931)
Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10292 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search')
-rw-r--r--phpBB/includes/search/fulltext_mysql.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index d1c1ff00d1..c72e674011 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -444,7 +444,7 @@ class fulltext_mysql extends search_backend
if (sizeof($author_ary) && $author_name)
{
// first one matches post of registered users, second one guests and deleted users
- $sql_author = '(' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
+ $sql_author = ' AND (' . $db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
}
else if (sizeof($author_ary))
{