aaand restore behavior from prior to r24882 on expected input

diff --git a/includes/Xml.php b/includes/Xml.php
index 2082d68..d7261a1 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -42,13 +42,15 @@ class Xml {
         */
        private static function expandAttributes( $attribs ) {
                $out = '';
-               if( is_array( $attribs ) ) {
+               if( is_null( $attribs ) ) {
+                       return null;
+               } elseif( is_array( $attribs ) ) {
                        foreach( $attribs as $name => $val )
                                $out .= " {$name}=\"" . Sanitizer::encodeAttribute( $val ) . '"';
+                       return $out;
                } else {
                        throw new MWException( 'Expected attribute array, got something else in ' . __METHOD__ );
                }
-               return $out;
        }
 
        /**