aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search/fulltext_native.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-01-29 00:02:42 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-01-29 00:02:42 +0100
commitd7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41 (patch)
tree44223a34a0b63c74346e27b81983992790714982 /phpBB/phpbb/search/fulltext_native.php
parent91ff42d501d86a8bf7685a864718a950f52daae5 (diff)
parentf0f88c287c4969eb9c1783ace2faa8a44cf59bd9 (diff)
downloadforums-d7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41.tar
forums-d7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41.tar.gz
forums-d7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41.tar.bz2
forums-d7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41.tar.xz
forums-d7741cea60cd4f9d5a5ea0bb812d26bc1fea7f41.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
Diffstat (limited to 'phpBB/phpbb/search/fulltext_native.php')
-rw-r--r--phpBB/phpbb/search/fulltext_native.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 69025fc08f..cb681ec270 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -303,7 +303,7 @@ class fulltext_native extends \phpbb\search\base
$this->search_query = $keywords;
$exact_words = array();
- preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
+ preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
$exact_words = $exact_words[1];
$common_ids = $words = array();