Merge "Drop MinervaEnableSiteNotice"

This commit is contained in:
jenkins-bot 2020-06-04 19:38:15 +00:00 committed by Gerrit Code Review
commit b51d095001
3 changed files with 3 additions and 16 deletions

View file

@ -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`

View file

@ -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

View file

@ -33,9 +33,6 @@
0
]
},
"MinervaEnableSiteNotice": {
"value": false
},
"MinervaApplyKnownTemplateHacks": {
"value": false
},