From: Kaldari <rkaldari@wikimedia.org>
Date: Sun, 8 Jul 2012 04:58:30 +0000 (-0700)
Subject: mediawiki.api.edit: Use the new 'tokens' api action
X-Git-Tag: 1.31.0-rc.0~23100
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=5f5b124e4f27179f4d8ee2059f62d49b5d5656b6;p=lhc%2Fweb%2Fwiklou.git

mediawiki.api.edit: Use the new 'tokens' api action

Use action=tokens instead of the old way with info properties
for a fake title.

Change-Id: I35cd26180e7af7122ff64ce146199cdaa5f7d88b
---

diff --git a/resources/mediawiki.api/mediawiki.api.edit.js b/resources/mediawiki.api/mediawiki.api.edit.js
index a9d488a832..5197396d2e 100644
--- a/resources/mediawiki.api/mediawiki.api.edit.js
+++ b/resources/mediawiki.api/mediawiki.api.edit.js
@@ -60,21 +60,15 @@
 		 */
 		getEditToken: function( tokenCallback, err ) {
 			var parameters = {
-					prop: 'info',
-					intoken: 'edit',
-					// we need some kind of dummy page to get a token from. This will return a response
-					// complaining that the page is missing, but we should also get an edit token
-					titles: 'DummyPageForEditToken'
+					action: 'tokens',
+					type: 'edit'
 				},
 				ok = function( data ) {
 					var token;
-					$.each( data.query.pages, function( i, page ) {
-						if ( page.edittoken ) {
-							token = page.edittoken;
-							return false;
-						}
-					} );
-					if ( token !== undefined ) {
+					// If token type is not available for this user,
+					// key 'edittoken' is missing or can contain Boolean false
+					if ( data.tokens && data.tokens.edittoken ) {
+						token = data.tokens.edittoken;
 						cachedToken = token;
 						tokenCallback( token );
 					} else {