From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 24 May 2010 14:12:42 +0000 (+0000)
Subject: Cosmetic in head scripts
X-Git-Tag: 1.31.0-rc.0~36747
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=ffa7a050a4dc5cd801af3ac6bd70c709a9536249;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index de425d2db9..9f4d61e8e3 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -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