From e2f491f9b981670e27f87e9d92f4fabb0a045e6a Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 25 Jun 2009 00:00:51 +0000
Subject: [PATCH] Followup to r52379: Also remove var declarations.

---
 includes/Skin.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index aa11d814ab..6ff984b177 100644
--- 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 );
 	}
 
 	/**
-- 
2.20.1