http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88554

Revision: 88554
Author:   krinkle
Date:     2011-05-21 23:14:53 +0000 (Sat, 21 May 2011)
Log Message:
-----------
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
    trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js

Modified: 
trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php
===================================================================
--- trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php     
2011-05-21 22:52:32 UTC (rev 88553)
+++ trunk/phase3/includes/resourceloader/ResourceLoaderUserTokensModule.php     
2011-05-21 23:14:53 UTC (rev 88554)
@@ -41,6 +41,7 @@
 
                return array(
                        'editToken' => $wgUser->edittoken(),
+                       'watchToken' => ApiQueryInfo::getWatchToken(),
                );
        }
 

Modified: trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js
===================================================================
--- trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js      
2011-05-21 22:52:32 UTC (rev 88553)
+++ trunk/phase3/resources/mediawiki.action/mediawiki.action.watch.ajax.js      
2011-05-21 23:14:53 UTC (rev 88554)
@@ -118,6 +118,7 @@
                        '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' )
                };


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to