diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-11-26 19:23:33 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-11-26 19:23:33 +0000 |
| commit | 313648f07bb82bccb2101c8dd7be36c007f76038 (patch) | |
| tree | 4aac7368445dbd6eb730be18af04ca3847ec599f /phpBB | |
| parent | 5a8fb00ff90e502a4253cf1a71d4146c6ba8cce7 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ <li>[Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)</li> <li>[Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)</li> <li>[Fix] Make word censoring case insensitive. (Bug #54265)</li> + <li>[Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> </ul> 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)) { |