Followup to r52379: Also remove var declarations.

diff --git a/includes/Skin.php b/includes/Skin.php
index aa11d81..6ff984b 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -333,14 +333,21 @@ class Skin extends Linker {
        static function makeVariablesScript( $data ) {
                global $wgJsMimeType;
 
-               $r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/" );
+               $doneFirstVar = false;
+               $r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/\n" );
                foreach ( $data as $name => $value ) {
                        $encValue = Xml::encodeJsVar( $value );
-                       $r[] = "var $name = $encValue;";
+                       if ( $doneFirstVar )
+                               $r[] = ",\n$name=$encValue";
+                       else {
+                               $r[] = "var $name=$encValue";
+                               $doneFirstVar = true;
+                       }
                }
-               $r[] = "/*]]>*/</script>\n";
+               # No need for ; since the script is terminating
+               $r[] = "\n/*]]>*/</script>\n";
 
-               return implode( "\n", $r );
+               return implode( $r );
        }
 
        /**