Merge branch '3.0' into 3

silverstripe · Oct 27, 2024 · 6a551f0 · 6a551f0
2 parents de0f5e9 + c169fad
commit 6a551f0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/DataFormatter/XMLDataFormatter.php b/src/DataFormatter/XMLDataFormatter.php
@@ -126,7 +126,7 @@ public function convertDataObjectWithoutHeader(DataObject $obj, $fields = null,
                 continue;
             }
             $fieldValue = $obj->obj($fieldName)->forTemplate();
-            if (!mb_check_encoding($fieldValue, 'utf-8')) {
+            if (isset($fieldValue) && !mb_check_encoding($fieldValue, 'utf-8')) {
                 $fieldValue = "(data is badly encoded)";
             }