From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/resourceloader/ResourceLoaderUserTokensModule.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'includes/resourceloader/ResourceLoaderUserTokensModule.php') diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php index 92ebbe93..668467ca 100644 --- a/includes/resourceloader/ResourceLoaderUserTokensModule.php +++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php @@ -30,25 +30,27 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule { protected $origin = self::ORIGIN_CORE_INDIVIDUAL; + protected $targets = array( 'desktop', 'mobile' ); + /* Methods */ /** * Fetch the tokens for the current user. * - * @return array: List of tokens keyed by token type + * @return array List of tokens keyed by token type */ protected function contextUserTokens() { global $wgUser; return array( 'editToken' => $wgUser->getEditToken(), - 'patrolToken' => ApiQueryRecentChanges::getPatrolToken( null, null ), - 'watchToken' => ApiQueryInfo::getWatchToken( null, null ), + 'patrolToken' => $wgUser->getEditToken( 'patrol' ), + 'watchToken' => $wgUser->getEditToken( 'watch' ), ); } /** - * @param $context ResourceLoaderContext + * @param ResourceLoaderContext $context * @return string */ public function getScript( ResourceLoaderContext $context ) { -- cgit v1.2.3-54-g00ecf