From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Fri, 10 Sep 2010 20:45:58 +0000 (+0000)
Subject: Merged load and go. At least for now, this seems to make sense.
X-Git-Tag: 1.31.0-rc.0~35037
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=163caec816e1497d0e987e836c8890f2b4a8be3d;p=lhc%2Fweb%2Fwiklou.git

Merged load and go. At least for now, this seems to make sense.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e502f1ba0c..13b436f9a1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2340,13 +2340,10 @@ class OutputPage {
 			// Modules - let the client calculate dependencies and batch requests as it likes
 			$modules = FormatJson::encode( $this->getModules() );
 			$scripts .= Html::inlineScript(
-				"if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); }"
+				"if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
 			);
 		}
 		
-		// Add code to fetch all requested modules
-		$scripts .= Html::inlineScript( "if ( mediaWiki !== undefined ) { mediaWiki.loader.go(); }" );
-		
 		// TODO: User Scripts should be included using the resource loader
 		// Add user JS if enabled
 		if( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) {