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
Stop overwriting $cache in User::getCacheKey()
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderUserOptionsModule.php
diff --git
a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index
a15d310
..
0d40ad7
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/
includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@
-32,7
+32,7
@@
class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
protected $targets = [ 'desktop', 'mobile' ];
/**
protected $targets = [ 'desktop', 'mobile' ];
/**
- * @param ResourceLoaderContext $context
+ * @param ResourceLoaderContext
|null
$context
* @return array List of module names as strings
*/
public function getDependencies( ResourceLoaderContext $context = null ) {
* @return array List of module names as strings
*/
public function getDependencies( ResourceLoaderContext $context = null ) {
@@
-51,7
+51,9
@@
class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
* @return string JavaScript code
*/
public function getScript( ResourceLoaderContext $context ) {
* @return string JavaScript code
*/
public function getScript( ResourceLoaderContext $context ) {
- return Xml::encodeJsCall( 'mw.user.options.set',
+ // Use FILTER_NOMIN annotation to prevent needless minification and caching (T84960).
+ return ResourceLoader::FILTER_NOMIN . Xml::encodeJsCall(
+ 'mw.user.options.set',
[ $context->getUserObj()->getOptions( User::GETOPTIONS_EXCLUDE_DEFAULTS ) ],
ResourceLoader::inDebugMode()
);
[ $context->getUserObj()->getOptions( User::GETOPTIONS_EXCLUDE_DEFAULTS ) ],
ResourceLoader::inDebugMode()
);