Merge pull request #2853 from annando/1610-bugfix-config

[friendica.git] / include / xml.php

diff --git a/include/xml.php b/include/xml.php
index f45d6cade0cdcf3272ae949ae4bf78ef75f115d9..3bb376abafe8034fb85d550248c4a0758832df83 100644 (file)
--- a/include/xml.php
+++ b/include/xml.php
@@ -61,6 +61,18 @@ class xml {
                                continue;
                        }
 
+                       $element_parts = explode(":", $key);
+                       if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
+                               $namespace = $namespaces[$element_parts[0]];
+                       elseif (isset($namespaces[""])) {
+                               $namespace = $namespaces[""];
+                       } else
+                               $namespace = NULL;
+
+                       // Remove undefined namespaces from the key
+                       if ((count($element_parts) > 1) AND is_null($namespace))
+                               $key = $element_parts[1];
+
                        if (substr($key, 0, 11) == "@attributes") {
                                if (!isset($element) OR !is_array($value))
                                        continue;
@@ -78,14 +90,6 @@ class xml {
                                continue;
                        }
 
-                       $element_parts = explode(":", $key);
-                       if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
-                               $namespace = $namespaces[$element_parts[0]];
-                       elseif (isset($namespaces[""]))
-                               $namespace = $namespaces[""];
-                       else
-                               $namespace = NULL;
-
                        if (!is_array($value))
                                $element = $xml->addChild($key, xmlify($value), $namespace);
                        elseif (is_array($value)) {