| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -1015,10 +1015,10 @@ |
| 1016 | 1016 | # If we use any dynamic CSS, make a little CDATA block out of it. |
| 1017 | 1017 | $s = ''; |
| 1018 | 1018 | foreach( $stylesheets as $link ) { |
| 1019 | | - $s .= "\t\t\t@import \"$link\";\n"; |
| | 1019 | + $s .= "@import \"$link\";\n"; |
| 1020 | 1020 | } |
| 1021 | 1021 | $s .= $rawcss; |
| 1022 | | - if( $s != '' ) $this->usercss = "/*<![CDATA[*/\n{$s}\t\t/*]]>*/"; |
| | 1022 | + if( $s != '' ) $this->usercss = "/*<![CDATA[*/\n{$s}/*]]>*/"; |
| 1023 | 1023 | |
| 1024 | 1024 | wfProfileOut( __METHOD__ ); |
| 1025 | 1025 | } |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -280,14 +280,14 @@ |
| 281 | 281 | static function makeVariablesScript( $data ) { |
| 282 | 282 | global $wgJsMimeType; |
| 283 | 283 | |
| 284 | | - $r = array( "<script type= \"$wgJsMimeType\">/*<![CDATA[*/" ); |
| | 284 | + $r = "<script type= \"$wgJsMimeType\">/*<![CDATA[*/\n"; |
| 285 | 285 | foreach ( $data as $name => $value ) { |
| 286 | 286 | $encValue = Xml::encodeJsVar( $value ); |
| 287 | | - $r[] = "var $name = $encValue;"; |
| | 287 | + $r .= "var $name = $encValue;\n"; |
| 288 | 288 | } |
| 289 | | - $r[] = "/*]]>*/</script>"; |
| | 289 | + $r .= "/*]]>*/</script>\n"; |
| 290 | 290 | |
| 291 | | - return implode( "\n\t\t", $r ); |
| | 291 | + return $r; |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |