Cosmetic in head scripts
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Mon, 24 May 2010 14:12:42 +0000 (14:12 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Mon, 24 May 2010 14:12:42 +0000 (14:12 +0000)
* add a new line before including wikibits.js
* don't add a new line between getHeadScripts() and getHeadItems()

includes/OutputPage.php

index de425d2..9f4d61e 100644 (file)
@@ -2138,8 +2138,7 @@ class OutputPage {
                $ret .= implode( "\n", array(
                        $this->getHeadLinks(),
                        $this->buildCssLinks(),
-                       $this->getHeadScripts( $sk ),
-                       $this->getHeadItems(),
+                       $this->getHeadScripts( $sk ) . $this->getHeadItems(),
                ) );
                if ( $sk->usercss ) {
                        $ret .= Html::inlineStyle( $sk->usercss );
@@ -2202,7 +2201,7 @@ class OutputPage {
                global $wgUser, $wgRequest, $wgJsMimeType, $wgUseSiteJs;
                global $wgStylePath, $wgStyleVersion;
 
-               $scripts = Skin::makeGlobalVariablesScript( $sk->getSkinName() );
+               $scripts = Skin::makeGlobalVariablesScript( $sk->getSkinName() ) . "\n";
                $scripts .= Html::linkedScript( "{$wgStylePath}/common/wikibits.js?$wgStyleVersion" );
 
                // add site JS if enabled