From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/resourceloader/ResourceLoaderUserTokensModule.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'includes/resourceloader/ResourceLoaderUserTokensModule.php') diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php index 62d096a6..6d787c50 100644 --- a/includes/resourceloader/ResourceLoaderUserTokensModule.php +++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php @@ -43,7 +43,8 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule { return array( 'editToken' => $wgUser->getEditToken(), - 'watchToken' => ApiQueryInfo::getWatchToken(null, null), + 'patrolToken' => ApiQueryRecentChanges::getPatrolToken( null, null ), + 'watchToken' => ApiQueryInfo::getWatchToken( null, null ), ); } -- cgit v1.2.2 From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/resourceloader/ResourceLoaderUserTokensModule.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'includes/resourceloader/ResourceLoaderUserTokensModule.php') diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php index 6d787c50..92ebbe93 100644 --- a/includes/resourceloader/ResourceLoaderUserTokensModule.php +++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php @@ -35,10 +35,9 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule { /** * Fetch the tokens for the current user. * - * @param $context ResourceLoaderContext: Context object - * @return Array: List of tokens keyed by token type + * @return array: List of tokens keyed by token type */ - protected function contextUserTokens( ResourceLoaderContext $context ) { + protected function contextUserTokens() { global $wgUser; return array( @@ -54,7 +53,9 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule { */ public function getScript( ResourceLoaderContext $context ) { return Xml::encodeJsCall( 'mw.user.tokens.set', - array( $this->contextUserTokens( $context ) ) ); + array( $this->contextUserTokens() ), + ResourceLoader::inDebugMode() + ); } /** -- cgit v1.2.2