| Index: trunk/extensions/WikiEditor/WikiEditor.php |
| — | — | @@ -47,10 +47,6 @@ |
| 48 | 48 | 'addMediaWizard' => array( 'global' => false, 'user' => false ), |
| 49 | 49 | ); |
| 50 | 50 | |
| 51 | | -// Bump this each time you change an icon without renaming it |
| 52 | | -// FIXME: This needs to be done dynamically |
| 53 | | -$wgWikiEditorIconVersion = 0; |
| 54 | | - |
| 55 | 51 | /* Setup */ |
| 56 | 52 | |
| 57 | 53 | $wgExtensionCredits['other'][] = array( |
| Index: trunk/extensions/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -387,14 +387,6 @@ |
| 388 | 388 | |
| 389 | 389 | static $features = array( |
| 390 | 390 | |
| 391 | | - /* Special features; not listed in $wgWikiEditorFeatures thus always enabled */ |
| 392 | | - |
| 393 | | - 'global' => array( |
| 394 | | - 'configurations' => array( |
| 395 | | - 'wgWikiEditorIconVersion', |
| 396 | | - ), |
| 397 | | - ), |
| 398 | | - |
| 399 | 391 | /* Beta Features */ |
| 400 | 392 | |
| 401 | 393 | 'toolbar' => array( |
| — | — | @@ -560,8 +552,7 @@ |
| 561 | 553 | protected static function isEnabled( $name ) { |
| 562 | 554 | global $wgWikiEditorFeatures, $wgUser; |
| 563 | 555 | |
| 564 | | - // Features not being controlled by $wgWikiEditorFeatures are always enabled, features with global set to true are |
| 565 | | - // always enabled |
| | 556 | + // Features with global set to true are always enabled |
| 566 | 557 | if ( !isset( $wgWikiEditorFeatures[$name] ) || $wgWikiEditorFeatures[$name]['global'] ) { |
| 567 | 558 | return true; |
| 568 | 559 | } |
| Index: trunk/extensions/WikiEditor/modules/jquery.wikiEditor.js |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | if ( src.substr( 0, 7 ) != 'http://' && src.substr( 0, 8 ) != 'https://' && src[0] != '/' ) { |
| 172 | 172 | src = path + src; |
| 173 | 173 | } |
| 174 | | - return src + '?' + mediaWiki.config.get( 'wgWikiEditorIconVersion' ); |
| | 174 | + return src + '?' + mediaWiki.loader.version( 'jquery.wikiEditor' ); |
| 175 | 175 | }, |
| 176 | 176 | /** |
| 177 | 177 | * Get the sprite offset for a language if available, icon for a language if available, or the default offset or icon, |