Bugfix for settings dialog

rudolphi · Feb 2, 2023 · b355180 · b355180
1 parent c48dad1
commit b355180
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/g_settings.php b/g_settings.php
@@ -253,7 +253,7 @@
 		}
 
 		if (is_array($rc_keys)) foreach ($rc_keys as $condition) {
-			$g_settings["reaction_conditions"][$condition]=$_REQUEST[$condition];
+			$g_settings["reaction_conditions"][$condition]=$_REQUEST[$condition]??null;
 		}
 		unset($g_settings["order_system"]); // crazy bug
 		unset($g_settings["use_java_upload"]);

diff --git a/lib_settings.php b/lib_settings.php
@@ -72,10 +72,22 @@ function getSubitemlistObject0($list_int_name,$fields,$index,$allowSomeHtml) {
 }
 
 function breakArray($arr) {
+	if (is_array($arr)) {
+		foreach ($arr as $idx => $entry) {
+			$arr[$idx]=breakArray($entry);
+		}
+		return $arr;
+	}
 	return str_replace(array(",","\n","\r"),array(","),$arr);
 }
 
 function unbreakArray($arr) {
+	if (is_array($arr)) {
+		foreach ($arr as $idx => $entry) {
+			$arr[$idx]=unbreakArray($entry);
+		}
+		return $arr;
+	}
 	return str_replace(array(" ","\n","\r"),"",$arr);
 }
 
@@ -88,7 +100,7 @@ function applyImgSetting($names) {
 function applySettings(& $arr,$names,$keys) {
 	foreach ($names as $name) {
 		foreach ($keys as $key) {
-			$arr[$name][$key]=$_REQUEST[$name."_".$key];
+			$arr[$name][$key]=$_REQUEST[$name."_".$key]??null;
 		}
 	}
 }