Merge pull request #18 from PlasticStudio/feature/bug-fixes

Feature/bug fixes
PlasticStudio · Sep 15, 2022 · 14128ef · 14128ef
2 parents af054e2 + 535aa70
commit 14128ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/SearchControllerExtension.php b/src/SearchControllerExtension.php
@@ -162,7 +162,12 @@ public function AdvancedSearchForm(){
 							$source = $source->filter($filter['Filters']);
 						}
 
-						$fields->push(CheckboxSetField::create($key, $filter['Label'], $source->map('ID','Title','All'), explode(',',$value))->addExtraClass('chosen-select'));
+						if ($value == null) {
+                            $default = '';
+                        } else {
+                            $default = explode(',', $value);
+                        }
+						$fields->push(CheckboxSetField::create($key, $filter['Label'], $source->map('ID','Title','All'), $default)->addExtraClass('chosen-select'));
 
 						break;
 				}

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