dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Remove tests that were skipped for MCR-enabled schema"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderUserDefaultsModule.php
diff --git
a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index
9610cce
..
75a2d7a
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/
includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@
-42,7
+42,7
@@
class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
*/
public function getScript( ResourceLoaderContext $context ) {
return 'mw.user.options.set('
- .
ResourceLoader::encodeJsonForScript
( User::getDefaultOptions() )
+ .
$context->encodeJson
( User::getDefaultOptions() )
. ');';
}
}