diff --git a/extension.json b/extension.json
index 4deffa85a..dc3661f50 100644
--- a/extension.json
+++ b/extension.json
@@ -430,7 +430,6 @@
"SendWatchlistEmailNotification": "EchoHooks::onSendWatchlistEmailNotification",
"GetNewMessagesAlert": "EchoHooks::abortNewMessagesAlert",
"LinksUpdateAfterInsert": "EchoHooks::onLinksUpdateAfterInsert",
- "GetBetaFeaturePreferences": "EchoHooks::getBetaFeaturePreferences",
"ResourceLoaderGetConfigVars": "EchoHooks::onResourceLoaderGetConfigVars"
},
"config": {
@@ -530,9 +529,6 @@
"EchoCrossWikiNotifications": {
"value": false
},
- "EchoUseCrossWikiBetaFeature": {
- "value": false
- },
"EchoNotificationCategories": {
"value": {
"system": {
diff --git a/i18n/en.json b/i18n/en.json
index d409250b8..5f3923af7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -54,8 +54,6 @@
"echo-pref-email-format-plain-text": "Plain text",
"echo-pref-cross-wiki-notifications": "Show notifications from other wikis",
"echo-pref-notifications-blacklist": "Do not display notifications from these users. ([[mw:Special:MyLanguage/Help:Notifications#mute|learn more]])",
- "echo-pref-beta-feature-cross-wiki-message": "Enhanced notifications",
- "echo-pref-beta-feature-cross-wiki-description": "View and organize notifications more easily. Includes cross-wiki notifications, which lets you see messages from other wikis. (To receive cross-wiki notifications on a given wiki, you must activate the beta feature on that wiki.)",
"echo-learn-more": "Learn more",
"echo-log": "Public log",
"echo-new-messages": "You have new messages",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9e6d5f937..4fe5cd215 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -53,8 +53,6 @@
"echo-pref-email-format-plain-text": "Option for users who want to receive plain text email notification.\n\nSee also:\n* {{msg-mw|Echo-pref-email-format}}\n{{Identical|Plain text}}",
"echo-pref-cross-wiki-notifications": "Label for a preference which enables notifications from other wikis. Only used if {{msg-mw|echo-pref-beta-feature-cross-wiki-message}} is not used.",
"echo-pref-notifications-blacklist": "Label for a preference which allows a user to block notifications from certain users.\n\nNote that the translatewiki.net tool may warn, if you alter the link to use an existing translated version linked from the English page at [[mw:Help:Notifications#mute]], such as [[mw:Help:Notifications/fr#mute]] for the French version.",
- "echo-pref-beta-feature-cross-wiki-message": "Label for the cross-wiki notifications Beta Feature. Only used if {{msg-mw|echo-pref-cross-wiki-notifications}} is not used.",
- "echo-pref-beta-feature-cross-wiki-description": "Description for the cross-wiki notifications Beta Feature, describing the feature that will be enabled. Only used if {{msg-mw|echo-pref-cross-wiki-notifications}} is not used.",
"echo-learn-more": "Text for link to more information about a topic.\n{{Identical|Learn more}}",
"echo-log": "Text for link to go to Special:Log",
"echo-new-messages": "Message to let the user know that they have new talk page messages, displayed in the personal menu (top-right corner on Vector and Monobook).\n\nKeep this message short. It '''should not''' end in a full stop.",
diff --git a/images/betafeatures-icon-notifications-ltr.svg b/images/betafeatures-icon-notifications-ltr.svg
deleted file mode 100644
index 71f58f569..000000000
--- a/images/betafeatures-icon-notifications-ltr.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
diff --git a/images/betafeatures-icon-notifications-rtl.svg b/images/betafeatures-icon-notifications-rtl.svg
deleted file mode 100644
index 5a2aa0b35..000000000
--- a/images/betafeatures-icon-notifications-rtl.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
diff --git a/includes/EchoHooks.php b/includes/EchoHooks.php
index ece4a345e..f8976182e 100644
--- a/includes/EchoHooks.php
+++ b/includes/EchoHooks.php
@@ -282,36 +282,6 @@ class EchoHooks {
return true;
}
- /**
- * Handler for the GetBetaFeaturePreferences hook.
- * @see https://www.mediawiki.org/wiki/Manual:Hooks/GetBetaFeaturePreferences
- *
- * @param User $user User to get preferences for
- * @param array &$preferences Preferences array
- *
- * @return bool true in all cases
- */
- public static function getBetaFeaturePreferences( User $user, array &$preferences ) {
- global $wgExtensionAssetsPath, $wgEchoUseCrossWikiBetaFeature, $wgEchoCrossWikiNotifications;
-
- if ( $wgEchoUseCrossWikiBetaFeature && $wgEchoCrossWikiNotifications ) {
- $preferences['echo-cross-wiki-notifications'] = [
- 'label-message' => 'echo-pref-beta-feature-cross-wiki-message',
- 'desc-message' => 'echo-pref-beta-feature-cross-wiki-description',
- // Paths to images that represents the feature.
- 'screenshot' => [
- 'rtl' => "$wgExtensionAssetsPath/Echo/images/betafeatures-icon-notifications-rtl.svg",
- 'ltr' => "$wgExtensionAssetsPath/Echo/images/betafeatures-icon-notifications-ltr.svg",
- ],
- 'info-link' => 'https://www.mediawiki.org/wiki/Special:Mylanguage/Help:Notifications/Cross-wiki',
- // Link to discussion about the feature - talk pages might work
- 'discussion-link' => 'https://www.mediawiki.org/wiki/Help_talk:Notifications',
- ];
- }
-
- return true;
- }
-
/**
* Handler for GetPreferences hook.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
@@ -325,7 +295,7 @@ class EchoHooks {
public static function getPreferences( $user, &$preferences ) {
global $wgEchoEnableEmailBatch,
$wgEchoNotifiers, $wgEchoNotificationCategories, $wgEchoNotifications,
- $wgAllowHTMLEmail, $wgEchoUseCrossWikiBetaFeature,
+ $wgAllowHTMLEmail,
$wgEchoCrossWikiNotifications, $wgEchoPerUserBlacklist;
$attributeManager = EchoAttributeManager::newFromGlobalVars();
@@ -464,7 +434,7 @@ class EchoHooks {
'tooltips' => $tooltips,
];
- if ( !$wgEchoUseCrossWikiBetaFeature && $wgEchoCrossWikiNotifications ) {
+ if ( $wgEchoCrossWikiNotifications ) {
$preferences['echo-cross-wiki-notifications'] = [
'type' => 'toggle',
'label-message' => 'echo-pref-cross-wiki-notifications',