r108155 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108154‎ | r108155 | r108156 >
Date:18:03, 5 January 2012
Author:rmoen
Status:ok
Tags:
Comment:
remove redundant mbEditToken config. use existing mw functions for getting user edit token
Modified paths:
  • /trunk/extensions/MoodBar/MoodBar.hooks.php (modified) (history)
  • /trunk/extensions/MoodBar/modules/jquery.moodBar/jquery.moodBar.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MoodBar/MoodBar.hooks.php
@@ -109,7 +109,6 @@
110110
111111 public static function makeGlobalVariablesScript( &$vars ) {
112112 global $wgUser, $wgEnableEmail;
113 - $vars['mbEditToken'] = $wgUser->editToken();
114113 $vars['mbEmailEnabled'] = $wgEnableEmail;
115114 $vars['mbUserEmail'] = strlen( $wgUser->getEmail() ) > 0 ? true : false;
116115 $vars['mbIsEmailConfirmationPending'] = $wgUser->isEmailConfirmationPending(); //returns false if email authentication off, and if email is confimed already
Index: trunk/extensions/MoodBar/modules/jquery.moodBar/jquery.moodBar.js
@@ -32,7 +32,7 @@
3333 'system': clientData.platform,
3434 'bucket': fb.bucket,
3535 'type': fb.type,
36 - 'token': mw.config.get('mbEditToken'),
 36+ 'token': mw.user.tokens.get('editToken'),
3737 'format': 'json'
3838 };
3939
@@ -58,7 +58,7 @@
5959 'action': 'moodbarsetuseremail',
6060 'mbaction': 'setemail',
6161 'email': mbProps.email,
62 - 'token': mw.config.get('mbEditToken'),
 62+ 'token': mw.user.tokens.get('editToken'),
6363 'format':'json'
6464 };
6565 return $.ajax( {
@@ -74,7 +74,7 @@
7575 var apiRequest = {
7676 'action': 'moodbarsetuseremail',
7777 'mbaction': 'resendverification',
78 - 'token': mw.config.get('mbEditToken'),
 78+ 'token': mw.user.tokens.get('editToken'),
7979 'format':'json'
8080 };
8181 return $.ajax( {

Follow-up revisions

RevisionCommit summaryAuthorDate
r108156use existing mw function for getting user edit token in fbd. follow up r108155rmoen18:04, 5 January 2012

Status & tagging log