tobias/friendica
1
0
Fork 0
Code Pull requests Activity

forgotten self

Browse source 
forgotten self references
This commit is contained in:
Adam Magness 2018-11-03 13:25:00 -04:00
parent 61bc9facc8
commit ae4aab872f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Util/XML.php
View file

@ -36,7 +36,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.">".xmlify($value)."</".$key.">"); $root = new SimpleXMLElement("<".$key.">".self::xmlify($value)."</".$key.">");
} }
$dom = dom_import_simplexml($root)->ownerDocument; $dom = dom_import_simplexml($root)->ownerDocument;
@ -104,7 +104,7 @@ class XML
} }
if (!is_array($value)) { if (!is_array($value)) {
$element = $xml->addChild($key, xmlify($value), $namespace); $element = $xml->addChild($key, self::xmlify($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);
@ -123,7 +123,7 @@ class XML
public static function copy(&$source, &$target, $elementname) public static function copy(&$source, &$target, $elementname)
{ {
if (count($source->children()) == 0) { if (count($source->children()) == 0) {
$target->addChild($elementname, xmlify($source)); $target->addChild($elementname, self::xmlify($source));
} else { } else {
$child = $target->addChild($elementname); $child = $target->addChild($elementname);
foreach ($source->children() as $childfield => $childentry) { foreach ($source->children() as $childfield => $childentry) {
@ -144,11 +144,11 @@ class XML
*/ */
public static function createElement($doc, $element, $value = "", $attributes = []) public static function createElement($doc, $element, $value = "", $attributes = [])
{ {
$element = $doc->createElement($element, xmlify($value)); $element = $doc->createElement($element, self::xmlify($value));
foreach ($attributes as $key => $value) { foreach ($attributes as $key => $value) {
$attribute = $doc->createAttribute($key); $attribute = $doc->createAttribute($key);
$attribute->value = xmlify($value); $attribute->value = self::xmlify($value);
$element->appendChild($attribute); $element->appendChild($attribute);
} }
return $element; return $element;