r77696 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r77695‎ | r77696 | r77697 >
Date:00:35, 4 December 2010
Author:tparscal
Status:resolved (Comments)
Tags:
Comment:
Made use of Xml::encodeJsCall - improves on r77693.
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
——@@ -2436,10 +2436,11 @@
24372437
24382438 // Modules requests - let the client calculate dependencies and batch requests as it likes
24392439 if ( $this->getModules() ) {
2440 - $modules = FormatJson::encode( $this->getModules() );
 2440+ $modules = FormatJson::encode( );
24412441 $scripts .= Html::inlineScript(
24422442 ResourceLoader::makeLoaderConditionalScript(
2443 - "mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go();"
 2443+ Xml::encodeJsCall( 'mediaWiki.loader.load', $this->getModules() ) .
 2444+ Xml::encodeJsCall( 'mediaWiki.loader.go' )
24442445 )
24452446 ) . "\n";
24462447 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r77702Fixes r77696 where a few mistakes were made. Also improves on r77693 by using...tparscal00:48, 4 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77693Resolves bug #26131 by always placing user scripts and styles at the very end...tparscal23:59, 3 December 2010

Comments

#Comment by Trevor Parscal (WMF) (talk | contribs)   00:47, 4 December 2010

Um, ooops - this totally doesn't work.. It leaves an empty call to FormatJson::encode, and it doesn't properly use Xml::encodeJsCall...

Status & tagging log