friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-08 01:10:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fixed:

Browse source 
- prevent NULL from being handled over to XML::escape()
- still I wonder that an object can be? It is a string-only accepting method
This commit is contained in:
Roland Häder 2022-06-21 01:41:34 +02:00
parent 95f9eb34ac
commit 3e522ed512
Signed by: roland
GPG key ID: C82EDE5DDFA0BA77
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Util/XML.php
View file

@ -56,7 +56,7 @@ class XML
$root = new SimpleXMLElement('<' . $key . '/>'); $root = new SimpleXMLElement('<' . $key . '/>');
self::fromArray($value, $root, $remove_header, $namespaces, false); self::fromArray($value, $root, $remove_header, $namespaces, false);
} else { } else {
$root = new SimpleXMLElement('<' . $key . '>'.self::escape($value).'</' . $key . '>'); $root = new SimpleXMLElement('<' . $key . '>' . self::escape($value ?? '') . '</' . $key . '>');
} }
$dom = dom_import_simplexml($root)->ownerDocument; $dom = dom_import_simplexml($root)->ownerDocument;
@ -124,7 +124,7 @@ class XML
} }
if (!is_array($value)) { if (!is_array($value)) {
$element = $xml->addChild($key, self::escape($value), $namespace); $element = $xml->addChild($key, self::escape($value ?? ''), $namespace);
} elseif (is_array($value)) { } elseif (is_array($value)) {
$element = $xml->addChild($key, null, $namespace); $element = $xml->addChild($key, null, $namespace);
self::fromArray($value, $element, $remove_header, $namespaces, false); self::fromArray($value, $element, $remove_header, $namespaces, false);