Merge pull request #1310 from Fossil01/master

Add more string escape/replace methods for search
NNTmux · Apr 9, 2023 · 25d07de · 25d07de
2 parents 3761c71 + 4893bf6
commit 25d07de
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Blacklight/ManticoreSearch.php b/Blacklight/ManticoreSearch.php
@@ -98,10 +98,18 @@ public function deleteRelease(array $identifiers): void
      */
     public static function escapeString(string $string): string
     {
-        $from = ['\\', '(', ')', '@', '~', '"', '&', '/', '$', '=', "'"];
-        $to = ['\\\\', '\(', '\)', '\@', '\~', '\"', '\&', '\/', '\$', '\=', "\'"];
+        if ($string === '*') {
+            return '';
+        }
+
+        $from = ['\\', '(', ')', '@', '~', '"', '&', '/', '$', '=', "'", '--', '[', ']'];
+        $to = ['\\\\', '\(', '\)', '\@', '\~', '\"', '\&', '\/', '\$', '\=', "\', '\--", '\[', '\]'];
+
+        $string = str_replace($from, $to, $string);
+        $string = Str::replaceLast('!', '', $string);
+        $string = Str::replaceLast('-', '', $string);
 
-        return str_replace($from, $to, $string);
+        return $string;
     }
 
     public function updateRelease(int|string $releaseID): void