diff --git a/extension.json b/extension.json index bcaec7e53..bfaf358a4 100644 --- a/extension.json +++ b/extension.json @@ -62,7 +62,6 @@ { "name": "config.json", "config": { - "enable": "DiscussionToolsEnable", "replyIndentation": "DiscussionToolsReplyIndentation", "switchTime": "DiscussionToolsTimestampFormatSwitchTime", "showFeedbackLinks": "DiscussionToolsShowFeedbackLinks" @@ -537,10 +536,6 @@ "discussiontools-visualenhancements": 1 }, "config": { - "DiscussionToolsEnable": { - "value": true, - "description": "Enable DiscussionTools on talk pages." - }, "DiscussionToolsBeta": { "value": false, "description": "Make DiscussionTools a BetaFeature." diff --git a/includes/Hooks/HookUtils.php b/includes/Hooks/HookUtils.php index ebf08bfbf..b3fdd8db3 100644 --- a/includes/Hooks/HookUtils.php +++ b/includes/Hooks/HookUtils.php @@ -202,10 +202,6 @@ class HookUtils { $services = MediaWikiServices::getInstance(); $dtConfig = $services->getConfigFactory()->makeConfig( 'discussiontools' ); - if ( !$dtConfig->get( 'DiscussionToolsEnable' ) ) { - return false; - } - if ( ( $feature === static::TOPICSUBSCRIPTION || $feature === static::AUTOTOPICSUB ) && // Users must be logged in to use topic subscription, and Echo must be installed (T322498) diff --git a/includes/Hooks/PreferenceHooks.php b/includes/Hooks/PreferenceHooks.php index e5414a940..c7b9ec22b 100644 --- a/includes/Hooks/PreferenceHooks.php +++ b/includes/Hooks/PreferenceHooks.php @@ -151,10 +151,7 @@ class PreferenceHooks implements 'type' => 'api', ]; - if ( - !$this->config->get( 'DiscussionToolsEnable' ) || - !$this->config->get( 'DiscussionToolsBeta' ) - ) { + if ( !$this->config->get( 'DiscussionToolsBeta' ) ) { // When out of beta, preserve the user preference in case we // bring back the beta feature for a new sub-feature. (T272071) $preferences['discussiontools-betaenable'] = [ @@ -210,10 +207,7 @@ class PreferenceHooks implements $dtConfig = MediaWikiServices::getInstance()->getConfigFactory() ->makeConfig( 'discussiontools' ); - if ( - $dtConfig->get( 'DiscussionToolsEnable' ) && - $dtConfig->get( 'DiscussionToolsBeta' ) - ) { + if ( $dtConfig->get( 'DiscussionToolsBeta' ) ) { $preferences['discussiontools-betaenable'] = [ 'version' => '1.0', 'label-message' => 'discussiontools-preference-label',