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

diff --git a/includes/Skin.php b/includes/Skin.php
index c625814..248a9e3 100644 (file)
--- 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 eb8e3b6..ae894cc 100644 (file)
--- 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__ );
        }