r72752 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72751‎ | r72752 | r72753 >
Date:20:45, 10 September 2010
Author:tparscal
Status:ok
Tags:
Comment:
Merged load and go. At least for now, this seems to make sense.
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -2340,13 +2340,10 @@
23412341 // Modules - let the client calculate dependencies and batch requests as it likes
23422342 $modules = FormatJson::encode( $this->getModules() );
23432343 $scripts .= Html::inlineScript(
2344 - "if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); }"
 2344+ "if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
23452345 );
23462346 }
23472347
2348 - // Add code to fetch all requested modules
2349 - $scripts .= Html::inlineScript( "if ( mediaWiki !== undefined ) { mediaWiki.loader.go(); }" );
2350 -
23512348 // TODO: User Scripts should be included using the resource loader
23522349 // Add user JS if enabled
23532350 if( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) {

Status & tagging log