From ef360c83afc0d25ea2a54c6d5c8d7ee636e13b94 Mon Sep 17 00:00:00 2001
From: Kieffer Navarro <kieffer.navarro@gmail.com>
Date: Wed, 9 Nov 2022 10:09:37 +0800
Subject: [PATCH 1/2] php8 fix for str replace

---
 src/SearchPageController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SearchPageController.php b/src/SearchPageController.php
index 688e6e7..65d6f80 100755
--- a/src/SearchPageController.php
+++ b/src/SearchPageController.php
@@ -163,9 +163,9 @@ public static function get_query($mysqlSafe = false){
 		$query = self::$query;
 		if ($query) {
 			if ($mysqlSafe) {
-				$query = str_replace("'", "\'", $query);
-				$query = str_replace('"', '\"', $query);
-				$query = str_replace('`', '\`', $query);
+				$query = str_replace("'", "\'", $query ?? '');
+				$query = str_replace('"', '\"', $query ?? '');
+				$query = str_replace('`', '\`', $query ?? '');
 			}
 		}
 		return $query;

From b85abd5dad0b2e44612b099f664671ab69f9baf5 Mon Sep 17 00:00:00 2001
From: Kieffer Navarro <kieffer.navarro@gmail.com>
Date: Thu, 10 Nov 2022 04:29:19 +0800
Subject: [PATCH 2/2] peer review code fix

---
 src/SearchPageController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SearchPageController.php b/src/SearchPageController.php
index 65d6f80..c7491c4 100755
--- a/src/SearchPageController.php
+++ b/src/SearchPageController.php
@@ -160,12 +160,12 @@ public static function get_mapped_filters(){
 	}
 	
 	public static function get_query($mysqlSafe = false){
-		$query = self::$query;
+		$query = self::$query ?? '';
 		if ($query) {
 			if ($mysqlSafe) {
-				$query = str_replace("'", "\'", $query ?? '');
-				$query = str_replace('"', '\"', $query ?? '');
-				$query = str_replace('`', '\`', $query ?? '');
+				$query = str_replace("'", "\'", $query);
+				$query = str_replace('"', '\"', $query);
+				$query = str_replace('`', '\`', $query);
 			}
 		}
 		return $query;