Yurik has submitted this change and it was merged.
Change subject: Remove Zero banner cruft
......................................................................
Remove Zero banner cruft
Rely on GetMobileNotice hook for it instead
Change-Id: Ia7ede9c5b782db6e9b7dbf23952e939cc18a7cc8
---
M includes/MobileFrontend.body.php
M includes/skins/SkinMobileBase.php
2 files changed, 1 insertion(+), 38 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index b712cac..1286d51 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -2,25 +2,8 @@
class ExtMobileFrontend extends ContextSource {
- protected $zeroRatedBanner;
-
public function __construct( IContextSource $context ) {
$this->setContext( $context );
- }
-
- /**
- * FIXME: Move to ZeroRatedMobileAccess extension
- * @return string
- */
- public function getZeroRatedBanner() {
- $zeroRatedBanner = $this->zeroRatedBanner ? str_replace(
'display:none;', '', $this->zeroRatedBanner ) : '';
-
- if ( $zeroRatedBanner ) {
- if ( strstr( $zeroRatedBanner,
'id="zero-rated-banner"><span' ) ) {
- $zeroRatedBanner = str_replace(
'id="zero-rated-banner"><span', 'id="zero-rated-banner"><span',
$zeroRatedBanner );
- }
- }
- return $zeroRatedBanner;
}
private function sendHeaders() {
@@ -60,21 +43,9 @@
wfProfileIn( __METHOD__ . '-formatter-init' );
$context = MobileContext::singleton();
+
$formatter = MobileFormatter::newFromContext( $context, $html );
- $doc = $formatter->getDoc();
wfProfileOut( __METHOD__ . '-formatter-init' );
-
- wfProfileIn( __METHOD__ . '-zero' );
- $zeroRatedBannerElement = $doc->getElementById(
'zero-rated-banner' );
-
- if ( !$zeroRatedBannerElement ) {
- $zeroRatedBannerElement = $doc->getElementById(
'zero-rated-banner-red' );
- }
-
- if ( $zeroRatedBannerElement ) {
- $this->zeroRatedBanner = $doc->saveXML(
$zeroRatedBannerElement, LIBXML_NOEMPTYTAG );
- }
- wfProfileOut( __METHOD__ . '-zero' );
wfProfileIn( __METHOD__ . '-filter' );
if ( $context->getContentTransformations() ) {
diff --git a/includes/skins/SkinMobileBase.php
b/includes/skins/SkinMobileBase.php
index 658eb28..cd6c0e3 100644
--- a/includes/skins/SkinMobileBase.php
+++ b/includes/skins/SkinMobileBase.php
@@ -26,12 +26,6 @@
$tpl->set( '_show_menu_headers', $menuHeaders );
$tpl->set( 'searchBox', $search );
- $banners = $tpl->data['banners'];
- // FIXME: Move to Zero extension MinervaPreRender hook
- if ( isset( $tpl->data['zeroRatedBanner'] ) ) {
- $banners[] = $tpl->data['zeroRatedBanner'];
- }
- $tpl->set( 'banners', $banners );
if ( $inBeta ) {
$this->prepareDataBeta( $tpl );
}
@@ -199,8 +193,6 @@
$tpl = $this->prepareTemplate();
$tpl->set( 'headelement', $out->headElement( $this ) );
$tpl->set( 'bodytext', $html );
- // FIXME: Move to ZeroRatedMobileAccess extension
- $tpl->set( 'zeroRatedBanner',
$this->extMobileFrontend->getZeroRatedBanner() );
$notice = '';
wfRunHooks( 'GetMobileNotice', array( $this, &$notice ) );
$tpl->set( 'notice', $notice );
--
To view, visit https://gerrit.wikimedia.org/r/67546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7ede9c5b782db6e9b7dbf23952e939cc18a7cc8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Yurik <[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
