r88554 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r88553‎ | r88554 | r88555 >
Date:23:14, 21 May 2011
Author:krinkle
Status:ok
Tags:
Comment:
Passing token paremeter in mw.action.watch.ajax since this is required as of r88522.

Follow-up: r88511, r88522, r88527, r88553
Modified paths:
  • /trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php (modified) (history)
  • /trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -41,6 +41,7 @@
4242
4343 return array(
4444 'editToken' => $wgUser->edittoken(),
 45+ 'watchToken' => ApiQueryInfo::getWatchToken(),
4546 );
4647 }
4748
Index: trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
@@ -118,6 +118,7 @@
119119 'action': 'watch',
120120 'format': 'json',
121121 'title': $link.data( 'target' ),
 122+ 'token': mw.user.tokens.get( 'watchToken' ),
122123 // API return contains a localized data.watch.message string.
123124 'uselang': mw.config.get( 'wgUserLanguage' )
124125 };

Follow-up revisions

RevisionCommit summaryAuthorDate
r88557Follow-up r88554: Passing null for now, fixed php error about missing arguments.krinkle23:41, 21 May 2011
r89545WatchAction requires token (BREAKING CHANGE)...krinkle00:09, 6 June 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r88511Removing wgAjaxWatch javascript global object....krinkle11:06, 21 May 2011
r88522* (bug 29070) Add token to action=watchreedy16:38, 21 May 2011
r88527Fixing mediawiki.action.watch.ajax...krinkle18:33, 21 May 2011
r88553Adding user.tokens module and loading by default. (ResourceLoaderUserTokensMo...krinkle22:52, 21 May 2011

Status & tagging log