wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 00:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not define contradictory user preferences for enabling/disabling VE

Browse source 
Depending on the config, we would sometimes define both the
'visualeditor-enable' and the 'visualeditor-betatempdisable'
preferences, even though they contradict each other.

Bug: T273188
Change-Id: I6ac7e4580bf232a5198ad8842f814bc381131e00
This commit is contained in:
Bartosz Dziewoński 2021-01-28 13:28:44 +01:00
parent b1fa5839c4
commit 4b1f141511
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/VisualEditorHooks.php
View file

@ -758,7 +758,10 @@ class VisualEditorHooks {
$veConfig = MediaWikiServices::getInstance()->getConfigFactory() $veConfig = MediaWikiServices::getInstance()->getConfigFactory()
->makeConfig( 'visualeditor' ); ->makeConfig( 'visualeditor' );
if ( !ExtensionRegistry::getInstance()->isLoaded( 'BetaFeatures' ) ) { if (
$veConfig->get( 'VisualEditorEnableBetaFeature' ) &&
!ExtensionRegistry::getInstance()->isLoaded( 'BetaFeatures' )
) {
// Config option for visual editing "alpha" state (no Beta Feature) // Config option for visual editing "alpha" state (no Beta Feature)
$namespaces = ApiVisualEditor::getAvailableNamespaceIds( $veConfig ); $namespaces = ApiVisualEditor::getAvailableNamespaceIds( $veConfig );
@ -780,6 +783,7 @@ class VisualEditorHooks {
$preferences['visualeditor-enable'] = $visualEnablePreference; $preferences['visualeditor-enable'] = $visualEnablePreference;
} }
if ( !$veConfig->get( 'VisualEditorEnableBetaFeature' ) ) {
// Config option for visual editing "deployed" state (opt-out) // Config option for visual editing "deployed" state (opt-out)
$preferences['visualeditor-betatempdisable'] = [ $preferences['visualeditor-betatempdisable'] = [
'type' => 'toggle', 'type' => 'toggle',
@ -788,6 +792,7 @@ class VisualEditorHooks {
'default' => $user->getOption( 'visualeditor-betatempdisable' ) || 'default' => $user->getOption( 'visualeditor-betatempdisable' ) ||
$user->getOption( 'visualeditor-autodisable' ) $user->getOption( 'visualeditor-autodisable' )
]; ];
}
// Config option for wikitext editing "deployed" state (opt-out) // Config option for wikitext editing "deployed" state (opt-out)
if ( if (