jenkins-bot has submitted this change and it was merged.
Change subject: Treat template banner data as an array.
......................................................................
Treat template banner data as an array.
Change-Id: I5701293d173e0eaebb0583fe4329f598604164b5
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMobileBase.php
3 files changed, 14 insertions(+), 10 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 50ba236..fe417a0 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -110,7 +110,9 @@
<div id='mw-mf-page-center'>
<!-- start -->
<?php
- echo $this->html( 'banners' );
+ foreach( $this->data['banners'] as
$banner ):
+ echo $banner;
+ endforeach;
?>
<div class="header">
<?php
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3fc5200..cc720d5 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -25,6 +25,7 @@
}
public function prepareData( BaseTemplate $tpl ) {
+ global $wgMFEnableSiteNotice;
$title = $this->getTitle();
$user = $this->getUser();
$out = $this->getOutput();
@@ -73,6 +74,14 @@
'id'=> 'mw-mf-main-menu-button',
) )
);
+ $banners = array();
+ if ( isset( $tpl->data['notice'] ) ) {
+ $banners[] = $tpl->data['notice'];
+ }
+ if ( $wgMFEnableSiteNotice ) {
+ $banners[] = '<div id="siteNotice"></div>';
+ }
+ $tpl->set( 'banners', $banners );
}
/**
diff --git a/includes/skins/SkinMobileBase.php
b/includes/skins/SkinMobileBase.php
index 1e02296..9451517 100644
--- a/includes/skins/SkinMobileBase.php
+++ b/includes/skins/SkinMobileBase.php
@@ -11,7 +11,6 @@
private $pageClassNames = array();
public function prepareData( BaseTemplate $tpl ) {
- global $wgMFEnableSiteNotice;
parent::prepareData( $tpl );
$context = MobileContext::singleton();
$search = $tpl->data['searchBox'];
@@ -22,16 +21,10 @@
}
$tpl->set( 'searchBox', $search );
- $banners = '';
+ $banners = $tpl->data['banners'];
// FIXME: Move to Zero extension MinervaPreRender hook
if ( isset( $tpl->data['zeroRatedBanner'] ) ) {
- $banners .= $tpl->data['zeroRatedBanner'];
- }
- if ( isset( $tpl->data['notice'] ) ) {
- $banners .= $tpl->data['notice'];
- }
- if ( $wgMFEnableSiteNotice ) {
- $banners .= '<div id="siteNotice"></div>';
+ $banners[] = $tpl->data['zeroRatedBanner'];
}
$tpl->set( 'banners', $banners );
}
--
To view, visit https://gerrit.wikimedia.org/r/65138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5701293d173e0eaebb0583fe4329f598604164b5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
