resourceloader: Add $context to static functions in ResourceLoader

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderUserTokensModule.php

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index bfa7326..86012a0 100644 (file)
--- 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 ) )
+                       . ');';
        }
 
        /**