http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66828

Revision: 66828
Author:   ialex
Date:     2010-05-24 14:12:42 +0000 (Mon, 24 May 2010)

Log Message:
-----------
Cosmetic in head scripts
* add a new line before including wikibits.js
* don't add a new line between getHeadScripts() and getHeadItems()

Modified Paths:
--------------
    trunk/phase3/includes/OutputPage.php

Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php        2010-05-24 14:05:24 UTC (rev 
66827)
+++ trunk/phase3/includes/OutputPage.php        2010-05-24 14:12:42 UTC (rev 
66828)
@@ -2138,8 +2138,7 @@
                $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 @@
                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



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to