Merge branch 'develop' of github.com:craftcms/cms into develop

craftcms · Feb 14, 2019 · fb8e087 · fb8e087
2 parents dfb9c8a + 1b68fe5
commit fb8e087
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - Fixed a bug where the `relatedTo` element query param could include results for elements that were related via soft-deleted Matrix blocks. ([#3846](https://github.com/craftcms/cms/issues/3846))
+- Fixed a bug where some edge case search queries would not match on MySQL servers.
 
 ## 3.1.11 - 2019-02-14
 

diff --git a/src/services/Search.php b/src/services/Search.php
@@ -564,7 +564,17 @@ private function _getSqlFromTerm(SearchQueryTerm $term, int $siteId = null): arr
 
                         // Add quotes for exact match
                         if ($isMysql && StringHelper::contains($keywords, ' ')) {
-                            $keywords = '"' . $keywords . '"';
+                            if (StringHelper::first($keywords, 1) === '*') {
+                                $keywords = StringHelper::insert($keywords, '"', 1);
+                            } else {
+                                $keywords = '"' . $keywords;
+                            }
+
+                            if (StringHelper::last($keywords, 1) === '*') {
+                                $keywords = StringHelper::insert($keywords, '"', StringHelper::length($keywords) - 1);
+                            } else {
+                                $keywords .= '"';
+                            }
                         }
 
                         // Determine prefix for the full-text keyword