From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 15 Jul 2008 21:33:26 +0000 (+0000)
Subject: Revert r37709 so I can cleanly revert other changes to these lines
X-Git-Tag: 1.31.0-rc.0~46490
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=c2e257cafd49100ec4a4928385846d50da91a76d;p=lhc%2Fweb%2Fwiklou.git

Revert r37709 so I can cleanly revert other changes to these lines
---

diff --git a/includes/Skin.php b/includes/Skin.php
index c625814214..248a9e3d62 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -280,14 +280,14 @@ class Skin extends Linker {
 	static function makeVariablesScript( $data ) {
 		global $wgJsMimeType;
 
-		$r = array( "<script type= \"$wgJsMimeType\">/*<![CDATA[*/" );
+		$r = "<script type= \"$wgJsMimeType\">/*<![CDATA[*/\n";
 		foreach ( $data as $name => $value ) {
 			$encValue = Xml::encodeJsVar( $value );
-			$r[] = "var $name = $encValue;";
+			$r .= "var $name = $encValue;\n";
 		}
-		$r[] = "/*]]>*/</script>";
+		$r .= "/*]]>*/</script>\n";
 
-		return implode( "\n\t\t", $r );
+		return $r;
 	}
 
 	/**
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index eb8e3b6636..ae894cc98b 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1015,10 +1015,10 @@ class SkinTemplate extends Skin {
 		# If we use any dynamic CSS, make a little CDATA block out of it.
 		$s = '';
 		foreach( $stylesheets as $link ) {
-			$s .= "\t\t\t@import \"$link\";\n";
+			$s .= "@import \"$link\";\n";
 		}
 		$s .= $rawcss;
-		if( $s != '' ) $this->usercss = "/*<![CDATA[*/\n{$s}\t\t/*]]>*/";
+		if( $s != '' ) $this->usercss = "/*<![CDATA[*/\n{$s}/*]]>*/";
 		
 		wfProfileOut( __METHOD__ );
 	}