aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-01-29 00:03:16 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-01-29 00:03:16 +0100
commitf48cc8bbe9792e0bf9182415c09cb5f50412b5a6 (patch)
tree2125519a8c5585f33aa5e516625f597a8a4cbe7c /phpBB
parent9d72463824d62e5506d8d9466e9713f70d413f18 (diff)
parent8da3a6f117ee4830b9026490c348347e7f8cecff (diff)
downloadforums-f48cc8bbe9792e0bf9182415c09cb5f50412b5a6.tar
forums-f48cc8bbe9792e0bf9182415c09cb5f50412b5a6.tar.gz
forums-f48cc8bbe9792e0bf9182415c09cb5f50412b5a6.tar.bz2
forums-f48cc8bbe9792e0bf9182415c09cb5f50412b5a6.tar.xz
forums-f48cc8bbe9792e0bf9182415c09cb5f50412b5a6.zip
Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/search/fulltext_native.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 29c5a72874..948911bbfe 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -204,7 +204,7 @@ class fulltext_native extends search_backend
$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();