s9y#844 Simplify code removing If statement because we escape term se…

…arch anyway + change alias to mysqli_real_escape_string
GuillaumeValadas · Jul 17, 2024 · f625eaf · f625eaf
1 parent 1c60209
commit f625eaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/include/db/mysqli.inc.php b/include/db/mysqli.inc.php
@@ -189,7 +189,7 @@ function serendipity_db_matched_rows() {
  */
 function serendipity_db_escape_string($string) {
     global $serendipity;
-    return mysqli_escape_string($serendipity['dbConn'], $string);
+    return mysqli_real_escape_string($serendipity['dbConn'], $string);
 }
 
 /**

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
@@ -882,12 +882,8 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
         $cond['distinct'] = '';
         $term             = str_replace('&quot;', '"', $term);
         $relevance_enabled = true;
-        if (preg_match('@["\+\-\*~<>\(\)]+@', $term)) {
-            $term = serendipity_db_escape_string($term);
-            $cond['find_part'] = "MATCH(title,body,extended) AGAINST('\"$term\"' IN BOOLEAN MODE)";
-        } else {
-            $cond['find_part'] = "MATCH(title,body,extended) AGAINST('$term')";
-        }
+        $term = serendipity_db_escape_string($term);
+        $cond['find_part'] = "MATCH(title,body,extended) AGAINST('\"$term\"' IN BOOLEAN MODE)";
     }
 
     switch($serendipity['searchsort']) {