r92843 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r92842‎ | r92843 | r92844 >
Date:01:33, 22 July 2011
Author:werdna
Status:deferred
Tags:
Comment:
Fix 1.17 compat and 1.18 compat as well
Modified paths:
  • /trunk/extensions/MoodBar/MoodBar.hooks.php (modified) (history)
  • /trunk/extensions/MoodBar/MoodBar.php (modified) (history)
  • /trunk/extensions/MoodBar/modules/jquery.moodBar/jquery.moodBar.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MoodBar/modules/jquery.moodBar/jquery.moodBar.js
@@ -33,7 +33,7 @@
3434 'system': clientData.platform,
3535 'bucket': fbProps.bucket,
3636 'type': fbProps.type,
37 - 'token': mw.user.tokens.get( 'editToken' ),
 37+ 'token': mw.config.get('mbConfig').editToken,
3838 'format': 'json'
3939 };
4040
Index: trunk/extensions/MoodBar/MoodBar.php
@@ -63,6 +63,10 @@
6464 ),
6565 );
6666
 67+if ( !$oldVersion ) {
 68+ $wgResourceModules['ext.moodBar.init']['dependencies'][] = 'mediawiki.user';
 69+}
 70+
6771 $wgResourceModules['ext.moodBar.core'] = $mbResourceTemplate + array(
6872 'styles' => 'ext.moodBar/ext.moodBar.core.css',
6973 'scripts' => 'ext.moodBar/ext.moodBar.core.js',
Index: trunk/extensions/MoodBar/MoodBar.hooks.php
@@ -54,6 +54,7 @@
5555 $vars['mbConfig'] = array(
5656 'validTypes' => MBFeedbackItem::getValidTypes(),
5757 'userBuckets' => MoodBarHooks::getUserBuckets( $wgUser ),
 58+ 'editToken' => $wgUser->editToken(),
5859 ) + $wgMoodBarConfig;
5960 return true;
6061 }

Status & tagging log