From 33e5c1eb79868d799abffc0ba032f2b6369e6209 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Wed, 3 Jun 2020 12:33:59 -0700
Subject: [PATCH] Drop MinervaEnableSiteNotice

This will make site notices display across the site as intended. The config
flag doesn't seem warranted - site notices should display across all skins
as they may contain important information.

This is preventing wikidata page banners from displaying in Minerva.
If this is controversial I can do a config-only change for Wikivoyages

Bug: T254391
Change-Id: I34c5e762b967ea94e33025e87f3446e8e029bc91
---
 README.md                      | 8 --------
 includes/Skins/SkinMinerva.php | 8 +++-----
 skin.json                      | 3 ---
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1d51d5dfb..82b8b09ae 100644
--- a/README.md
+++ b/README.md
@@ -28,14 +28,6 @@ The following configuration options will apply only to the default mobile skin -
 Whether to show the language switcher button even if no languages are available
 for the page.
 
-#### $wgMinervaEnableSiteNotice
-
-* Type: `Boolean`
-* Default: `false`
-
-Controls whether site notices should be shown.
-See <https://www.mediawiki.org/wiki/Manual:$wgSiteNotice>.
-
 #### $wgMinervaCountErrors
 * Type: `Boolean`
 * Default: `false`
diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index 48b279109..1a85ea67d 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -589,11 +589,9 @@ class SkinMinerva extends SkinTemplate {
 	protected function prepareBanners( BaseTemplate $tpl ) {
 		// Make sure Zero banner are always on top
 		$banners = [ '<div id="siteNotice"></div>' ];
-		if ( $this->getConfig()->get( 'MinervaEnableSiteNotice' ) ) {
-			$siteNotice = $this->getSiteNotice();
-			if ( $siteNotice ) {
-				$banners[] = $siteNotice;
-			}
+		$siteNotice = $this->getSiteNotice();
+		if ( $siteNotice ) {
+			$banners[] = $siteNotice;
 		}
 		$tpl->set( 'banners', $banners );
 		// These banners unlike 'banners' show inside the main content chrome underneath the
diff --git a/skin.json b/skin.json
index 68b44d772..a677a8235 100644
--- a/skin.json
+++ b/skin.json
@@ -33,9 +33,6 @@
 				0
 			]
 		},
-		"MinervaEnableSiteNotice": {
-			"value": false
-		},
 		"MinervaApplyKnownTemplateHacks": {
 			"value": false
 		},