X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderUserOptionsModule.php;h=0d40ad71ea104840714df327385eac234dec8ab4;hb=a646727f83ec107963dbe859600b6d44e1d2c42b;hp=a15d310bcd502b1a14d6d4ee9f1aa6ca81b8f993;hpb=f638ac8b9a832abb728f016e50129b9c928bf097;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php index a15d310bcd..0d40ad71ea 100644 --- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php +++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php @@ -32,7 +32,7 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule { 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 ) { @@ -51,7 +51,9 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule { * @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() );