dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc2fdf9)
Clean up some of the unnecessary tabs splattered throughout our output. They tend...
authorBrion Vibber <brion@users.mediawiki.org>
Sat, 22 Aug 2009 20:15:22 +0000 (20:15 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Sat, 22 Aug 2009 20:15:22 +0000 (20:15 +0000)
includes/OutputPage.php patch | blob | history
includes/Skin.php patch | blob | history

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 4c68b15..ea99d2d 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -98,7 +98,7 @@ class OutputPage {
                }
        }
        function addScript( $script ) {
-               $this->mScripts .= "\t\t" . $script . "\n";
+               $this->mScripts .= $script . "\n";
        }
 
        /**
@@ -275,7 +275,7 @@ class OutputPage {
         * @param string $script JavaScript text, no <script> tags
         */
        function addInlineScript( $script ) {
-               $this->mScripts .= "\t\t" . Html::inlineScript( "\n\t\t$script\n\t\t" ) . "\n";
+               $this->mScripts .= Html::inlineScript( "\n$script\n" ) . "\n";
        }
 
        function getScript() {
@@ -1703,7 +1703,8 @@ class OutputPage {
                        $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
                }
 
-               $ret .= "<head>\n\t<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n\t";
+               $ret .= "<head>\n";
+               $ret .= "<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
                $ret .= implode( "\n", array(
                        $this->getHeadLinks(),
                        $this->buildCssLinks(),
@@ -1824,7 +1825,7 @@ class OutputPage {
                        }
                }
 
-               return implode( "\n\t", $tags ) . "\n";
+               return implode( "\n", $tags ) . "\n";
        }
 
        /**
@@ -1901,7 +1902,7 @@ class OutputPage {
                                $links[] = $link;
                }
 
-               return "\t" . implode( "\n\t", $links );
+               return implode( "\n", $links );
        }
 
        protected function styleLink( $style, $options ) {
diff --git a/includes/Skin.php b/includes/Skin.php
index 7f1fd14..1ac24ac 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -488,7 +488,7 @@ class Skin extends Linker {
                                'action=raw&ctype='.$wgJsMimeType );
                        $wgOut->addScriptFile( $userjs );
                }
-               return "\t" . $vars . "\t" . $out->mScripts;
+               return $vars . "\n" . $out->mScripts;
        }
 
        /**
@@ -980,7 +980,7 @@ END;
         * @return String HTML-wrapped JS code to be put before </body>
         */
        function bottomScripts() {
-               $bottomScriptText = "\n\t\t" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
+               $bottomScriptText = "\n" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
                return $bottomScriptText;
        }
Wiklou, le Wiki du Wiklou