From 313648f07bb82bccb2101c8dd7be36c007f76038 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Nov 2009 19:23:33 +0000 Subject: [PATCH] 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 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/search/fulltext_mysql.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index cd32cc2e22..797d577e4d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,7 @@
  • [Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)
  • [Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)
  • [Fix] Make word censoring case insensitive. (Bug #54265)
    • +
  • [Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
  • [Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)
    • 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)) {