| Index: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | public static function addToolbar( &$toolbar ) { |
| 19 | 19 | global $wgUser, $wgEditToolbarGlobalEnable; |
| 20 | 20 | global $wgEditToolbarUserEnable, $wgEditToolbarCGDGlobalEnable; |
| 21 | | - global $wgEditToolbarCGDUserEnable; |
| | 21 | + global $wgEditToolbarCGDUserEnable, $wgWikiEditorIconVersion; |
| 22 | 22 | |
| 23 | 23 | // Only proceed if some specific conditions are met |
| 24 | 24 | if ( $wgEditToolbarGlobalEnable || ( $wgEditToolbarUserEnable && $wgUser->getOption( 'usebetatoolbar' ) ) ) { |
| — | — | @@ -28,7 +28,8 @@ |
| 29 | 29 | 'EditToolbar/EditToolbar.js', $wgEditToolbarStyleVersion |
| 30 | 30 | ); |
| 31 | 31 | UsabilityInitiativeHooks::addVariables( array( |
| 32 | | - 'wgEditToolbarCGD' => $wgEditToolbarCGDGlobalEnable || ( $wgEditToolbarCGDUserEnable && $wgUser->getOption( 'usebetatoolbar-cgd' ) ) |
| | 32 | + 'wgEditToolbarCGD' => $wgEditToolbarCGDGlobalEnable || ( $wgEditToolbarCGDUserEnable && $wgUser->getOption( 'usebetatoolbar-cgd' ) ), |
| | 33 | + 'wgWikiEditorIconVersion' => $wgWikiEditorIconVersion, |
| 33 | 34 | ) ); |
| 34 | 35 | // Internationalization |
| 35 | 36 | wfLoadExtensionMessages( 'EditToolbar' ); |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php |
| — | — | @@ -20,6 +20,7 @@ |
| 21 | 21 | |
| 22 | 22 | // Bump the version number every time you change any of the .css/.js files |
| 23 | 23 | $wgEditToolbarStyleVersion = 76; |
| | 24 | +$wgWikiEditorIconVersion = 0; |
| 24 | 25 | |
| 25 | 26 | // Set this to true to simply override the stock toolbar for everyone |
| 26 | 27 | $wgEditToolbarGlobalEnable = false; |