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 "[JobQueue] In addition to flushing any transaction, be sure to avoid new ones"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderUserOptionsModule.php
diff --git
a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index
4624cbc
..
0b7e196
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/
includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@
-56,7
+56,9
@@
class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
public function getScript( ResourceLoaderContext $context ) {
global $wgUser;
return Xml::encodeJsCall( 'mw.user.options.set',
- array( $wgUser->getOptions() ) );
+ array( $wgUser->getOptions() ),
+ ResourceLoader::inDebugMode()
+ );
}
/**