Fix: Don't call html_entity_decode for null values

gluafamichl · gluafamichl · commit 435065610c38 · 2024-10-29T08:41:08.000+01:00
diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php
@@ -398,7 +398,7 @@ protected static function db2json(array $feature, mixed $val): mixed
       $obj = array_map('intval', preg_split("/,/", $val, -1, PREG_SPLIT_NO_EMPTY));
     } elseif ($feature['type'] == 'dict' && $feature['subtype'] = 'bool') {
       $obj = unserialize($val);
-    } elseif (str_starts_with($feature['type'], 'str')) {
+    } elseif (str_starts_with($feature['type'], 'str') && $val !== null) {
       $obj = html_entity_decode($val, ENT_COMPAT, "UTF-8");
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ protected static function db2json(array $feature, mixed $val): mixed`
`398`	`398`	`$obj = array_map('intval', preg_split("/,/", $val, -1, PREG_SPLIT_NO_EMPTY));`
`399`	`399`	`} elseif ($feature['type'] == 'dict' && $feature['subtype'] = 'bool') {`
`400`	`400`	`$obj = unserialize($val);`
`401`		`- } elseif (str_starts_with($feature['type'], 'str')) {`
	`401`	`+ } elseif (str_starts_with($feature['type'], 'str') && $val !== null) {`
`402`	`402`	`$obj = html_entity_decode($val, ENT_COMPAT, "UTF-8");`
`403`	`403`	`}`
`404`	`404`	`else {`