From ea5cd595c962ae29465c8f23e503868cc605b9b2 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 27 Feb 2021 11:34:48 -0500 Subject: Remove + conversion in search except for tags (#3489) Before, every + sign was converted to a space to allow to search for spaces. But the documentation stated that to search for space one has to enclose the string in quotes. This has a confusing behavior when searching for a string containing a + sign. Now, the + conversion is kept only for the tag search since it's the only one documented that way. See #3454 --- app/Models/Search.php | 9 --------- 1 file changed, 9 deletions(-) (limited to 'app/Models') diff --git a/app/Models/Search.php b/app/Models/Search.php index 1e1b9c1ff..23d1024aa 100644 --- a/app/Models/Search.php +++ b/app/Models/Search.php @@ -217,7 +217,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->intitle = self::removeEmptyValues($this->intitle); - $this->intitle = self::decodeSpaces($this->intitle); return $input; } @@ -231,7 +230,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->not_intitle = self::removeEmptyValues($this->not_intitle); - $this->not_intitle = self::decodeSpaces($this->not_intitle); return $input; } @@ -255,7 +253,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->author = self::removeEmptyValues($this->author); - $this->author = self::decodeSpaces($this->author); return $input; } @@ -269,7 +266,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->not_author = self::removeEmptyValues($this->not_author); - $this->not_author = self::decodeSpaces($this->not_author); return $input; } @@ -287,7 +283,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->inurl = self::removeEmptyValues($this->inurl); - $this->inurl = self::decodeSpaces($this->inurl); return $input; } @@ -297,7 +292,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->not_inurl = self::removeEmptyValues($this->not_inurl); - $this->not_inurl = self::decodeSpaces($this->not_inurl); return $input; } @@ -416,7 +410,6 @@ class FreshRSS_Search { } else { $this->search = explode(' ', $input); } - $this->search = self::decodeSpaces($this->search); } private function parseNotSearch($input) { @@ -436,7 +429,6 @@ class FreshRSS_Search { $input = str_replace($matches[0], '', $input); } $this->not_search = self::removeEmptyValues($this->not_search); - $this->not_search = self::decodeSpaces($this->not_search); return $input; } @@ -450,5 +442,4 @@ class FreshRSS_Search { $input = preg_replace('/\s+/', ' ', $input); return trim($input); } - } -- cgit v1.2.3