Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326840 )

Change subject: Feature flag disabling of CentralNotice
......................................................................

Feature flag disabling of CentralNotice

The flag is named `MinervaDisableCentralNotice` and set to
`true` in beta as before.

Bug: T147944
Change-Id: I7b7fd40afefed57d6b640788081e0fba69717d85
---
M extension.json
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
3 files changed, 10 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/40/326840/1

diff --git a/extension.json b/extension.json
index daaf40a..761a572 100644
--- a/extension.json
+++ b/extension.json
@@ -2027,6 +2027,10 @@
                  "base": false,
                  "beta": true
                },
+               "MinervaDisableCentralNotice": {
+                 "base": false,
+                 "beta": true
+               },
                "MFStripResponsiveImages": true,
                "MFResponsiveImageWhitelist": [
                        "image/svg+xml"
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 62a5148..c7e7490 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1315,6 +1315,12 @@
                }
                $modules['site'] = 'mobile.site';
 
+               if ( $this->mobileContext->getConfigVariable( 
'MinervaDisableCentralNotice' ) ) {
+                       if ( array_key_exists( 'centralnotice', $modules ) ) {
+                               unset( $modules['centralnotice'] );
+                       }
+               }
+
                // FIXME: Upstream?
                Hooks::run( 'SkinMinervaDefaultModules', [ $this, &$modules ] );
                return $modules;
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index 4bf35cf..2e351a7 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -12,19 +12,4 @@
        public $template = 'MinervaTemplate';
        /** @var string $mode Describes 'stability' of the skin - beta, stable 
*/
        protected $mode = 'beta';
-
-       /**
-        * Returns the javascript modules to load.
-        * @return array
-        */
-       public function getDefaultModules() {
-               $modules = parent::getDefaultModules();
-
-               // Disable CentralNotice modules in beta
-               if ( array_key_exists( 'centralnotice', $modules ) ) {
-                       unset( $modules['centralnotice'] );
-               }
-
-               return $modules;
-       }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/326840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b7fd40afefed57d6b640788081e0fba69717d85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to