dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bfb5ec
)
Made use of Xml::encodeJsCall - improves on r77693.
author
Trevor Parscal
<tparscal@users.mediawiki.org>
Sat, 4 Dec 2010 00:35:10 +0000
(
00:35
+0000)
committer
Trevor Parscal
<tparscal@users.mediawiki.org>
Sat, 4 Dec 2010 00:35:10 +0000
(
00:35
+0000)
includes/OutputPage.php
patch
|
blob
|
history
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
508aace
..
ddea5c2
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-2436,10
+2436,11
@@
class OutputPage {
// Modules requests - let the client calculate dependencies and batch requests as it likes
if ( $this->getModules() ) {
- $modules = FormatJson::encode(
$this->getModules()
);
+ $modules = FormatJson::encode( );
$scripts .= Html::inlineScript(
ResourceLoader::makeLoaderConditionalScript(
- "mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go();"
+ Xml::encodeJsCall( 'mediaWiki.loader.load', $this->getModules() ) .
+ Xml::encodeJsCall( 'mediaWiki.loader.go' )
)
) . "\n";
}