Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345484 )
Change subject: Remove Minerva desktop skin beta feature
......................................................................
Remove Minerva desktop skin beta feature
We never used it and have no plans to use it so let's remove it.
Add reminder to remove hiding Minerva from preferences when
Minerva is in its own repository.
Change-Id: Ic84354279b1cfb3245c62d581771fea8d706e280
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 2 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/84/345484/1
diff --git a/extension.json b/extension.json
index b635549..bb3d234 100644
--- a/extension.json
+++ b/extension.json
@@ -1675,9 +1675,6 @@
"GetPreferences": [
"MobileFrontendHooks::onGetPreferences"
],
- "GetBetaFeaturePreferences": [
- "MobileFrontendHooks::onGetBetaFeaturePreferences"
- ],
"Gadgets::allowLegacy": [
"MobileFrontendHooks::onAllowLegacyGadgets"
],
@@ -1744,7 +1741,6 @@
},
"_merge_strategy": "array_plus_2d"
},
- "MFEnableMinervaBetaFeature": false,
"MFEnableJSConsoleRecruitment": false,
"MFMobileFormatterHeadings": [
"h1",
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index a91af0f..f310982 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -892,23 +892,6 @@
}
/**
- * Check whether Minerva has been enabled as a desktop skin via the
Minerva
- * beta feature.
- *
- * @param User $user
- *
- * @return bool
- */
- private static function hasEnabledMinervaBetaFeature( $user ) {
- $config = MobileContext::singleton()->getMFConfig();
- $mfEnableMinervaBetaFeature = $config->get(
'MFEnableMinervaBetaFeature' );
- $canEnableMinervaFeature = class_exists( 'BetaFeatures' ) &&
$mfEnableMinervaBetaFeature;
-
- return $canEnableMinervaFeature &&
- BetaFeatures::isFeatureEnabled( $user,
'betafeatures-minerva' );
- }
-
- /**
* GetPreferences hook handler
* @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
*
@@ -929,7 +912,8 @@
// Remove the Minerva skin from the preferences unless Minerva
has been enabled in
// BetaFeatures provided that the user has not set it as the
default skin.
- if ( $defaultSkin !== 'minerva' &&
!self::hasEnabledMinervaBetaFeature( $user ) ) {
+ // FIXME: This can be removed when Minerva lives in its own
repository.
+ if ( $defaultSkin !== 'minerva' ) {
// Preference key/values are backwards. The value is
the name of the skin. The
// key is the text+links to display.
if ( !empty( $preferences['skin']['options'] ) ) {
@@ -943,37 +927,6 @@
'type' => 'api',
'default' => '',
];
-
- return true;
- }
-
- /**
- * GetBetaFeaturePreferences hook handler
- * @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
- *
- * @param User $user
- * @param array $preferences
- *
- * @return bool
- */
- public static function onGetBetaFeaturePreferences( $user,
&$preferences ) {
- $context = MobileContext::singleton();
- $extensionAssetsPath = $context->getConfig()->get(
'ExtensionAssetsPath' );
- $mfEnableMinervaBetaFeature = $context->getMFConfig()->get(
'MFEnableMinervaBetaFeature' );
-
- if ( $mfEnableMinervaBetaFeature ) {
- // Enable the mobile skin on desktop
- $preferences['betafeatures-minerva'] = [
- 'label-message' => 'beta-feature-minerva',
- 'desc-message' =>
'beta-feature-minerva-description',
- 'info-link' =>
'//www.mediawiki.org/wiki/Beta_Features/Minerva',
- 'discussion-link' =>
'//www.mediawiki.org/wiki/Talk:Beta_Features/Minerva',
- 'screenshot' => [
- 'ltr' =>
"$extensionAssetsPath/MobileFrontend/images/BetaFeatures/minerva-ltr.svg",
- 'rtl' =>
"$extensionAssetsPath/MobileFrontend/images/BetaFeatures/minerva-rtl.svg",
- ],
- ];
- }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/345484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic84354279b1cfb3245c62d581771fea8d706e280
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
