Make Xml::expandAttributes() a bit more robust against non-array arguments; people...

diff --git a/includes/Xml.php b/includes/Xml.php
index eaedb79..e0548ed 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -41,15 +41,12 @@ class Xml {
         * @param $attribs Array of attributes for an XML element
         */
        private static function expandAttributes( $attribs ) {
-               if( is_null( $attribs ) ) {
-                       return null;
-               } else {
-                       $out = '';
-                       foreach( $attribs as $name => $val ) {
-                               $out .= ' ' . $name . '="' . Sanitizer::encodeAttribute( $val ) . '"';
-                       }
-                       return $out;
+               $out = '';
+               if( is_array( $attribs ) ) {
+                       foreach( $attribs as $name => $val )
+                               $out .= " {$name}=\"" . Sanitizer::encodeAttribute( $val ) . '"';
                }
+               return $out;
        }
 
        /**