diff --git a/core/modules/search/lib/Drupal/search/SearchQuery.php b/core/modules/search/lib/Drupal/search/SearchQuery.php index 95103a6..95313f8 100644 --- a/core/modules/search/lib/Drupal/search/SearchQuery.php +++ b/core/modules/search/lib/Drupal/search/SearchQuery.php @@ -192,6 +192,7 @@ class SearchQuery extends SelectExtender { * We build two queries that match the dataset bodies. */ protected function parseSearchExpression() { + $this->searchExpression = urldecode($this->searchExpression); // Matchs words optionally prefixed by a dash. A word in this case is // something between two spaces, optionally quoted. preg_match_all('/ (-?)("[^"]+"|[^" ]+)/i', ' ' . $this->searchExpression , $keywords, PREG_SET_ORDER); diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc index ff0d271..a20990f 100644 --- a/core/modules/search/search.pages.inc +++ b/core/modules/search/search.pages.inc @@ -16,7 +16,7 @@ function search_view($module = NULL, $keys = '') { $info = FALSE; $redirect = FALSE; - $keys = trim($keys); + $keys = urldecode(trim($keys)); // Also try to pull search keywords out of the $_REQUEST variable to // support old GET format of searches for existing links. if (!$keys && !empty($_REQUEST['keys'])) {