X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderUserTokensModule.php;h=86012a0341101dff03817ddf7f7b9a7fd6d27227;hb=2fc229116d6b040667b6f8592c48a8527abf2673;hp=bfa7326d9c604ff4a790dad2d4b435063e493936;hpb=cf35ff756c89ca6d6e003b440076df5ebe7ccef7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index bfa7326d9c..86012a0341 100644
--- a/includes/resourceloader/ResourceLoaderUserTokensModule.php
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -26,14 +26,10 @@
  */
 class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
 
-	/* Protected Members */
-
 	protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
 
 	protected $targets = [ 'desktop', 'mobile' ];
 
-	/* Methods */
-
 	/**
 	 * Fetch the tokens for the current user.
 	 *
@@ -52,19 +48,15 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
 	}
 
 	/**
-	 * Generate the JavaScript content of this module.
-	 *
-	 * Add FILTER_NOMIN annotation to prevent needless minification and caching (T84960).
-	 *
 	 * @param ResourceLoaderContext $context
 	 * @return string JavaScript code
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
-		return Xml::encodeJsCall(
-			'mw.user.tokens.set',
-			[ $this->contextUserTokens( $context ) ],
-			ResourceLoader::inDebugMode()
-		) . ResourceLoader::FILTER_NOMIN;
+		// Use FILTER_NOMIN annotation to prevent needless minification and caching (T84960).
+		return ResourceLoader::FILTER_NOMIN
+			. 'mw.user.tokens.set('
+			. $context->encodeJson( $this->contextUserTokens( $context ) )
+			. ');';
 	}
 
 	/**