From: Krinkle <krinkle@users.mediawiki.org>
Date: Sat, 21 May 2011 23:14:53 +0000 (+0000)
Subject: Passing token paremeter in mw.action.watch.ajax since this is required as of r88522.
X-Git-Tag: 1.31.0-rc.0~30020
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=19dc90be218715dfc1baf4b2b8b22cddf5db9e76;p=lhc%2Fweb%2Fwiklou.git

Passing token paremeter in mw.action.watch.ajax since this is required as of r88522.

Follow-up: r88511, r88522, r88527, r88553
---

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index 7122cddda9..1101ecaab6 100644
--- a/includes/resourceloader/ResourceLoaderUserTokensModule.php
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -41,6 +41,7 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
 
 		return array(
 			'editToken' => $wgUser->edittoken(),
+			'watchToken' => ApiQueryInfo::getWatchToken(),
 		);
 	}
 
diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
index 55a131fcf3..19e6d1e6f1 100644
--- a/resources/mediawiki.action/mediawiki.action.watch.ajax.js
+++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
@@ -118,6 +118,7 @@ $( document ).ready( function() {
 			'action': 'watch',
 			'format': 'json',
 			'title': $link.data( 'target' ),
+			'token': mw.user.tokens.get( 'watchToken' ),
 			// API return contains a localized data.watch.message string.
 			'uselang': mw.config.get( 'wgUserLanguage' )
 		};