Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71738
Change subject: Stop showing 'free' banner for images served on <lang>.zero.
......................................................................
Stop showing 'free' banner for images served on <lang>.zero.
Change-Id: I466c387f4939138be461442cba969c819eef1d75
---
M includes/PageRenderingHooks.php
M includes/ZeroConfigContent.php
2 files changed, 17 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/38/71738/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index df4a34d..7732c1c 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -84,7 +84,7 @@
$template->set( 'banners',
$template->data['banners'] );
self::emptyLangLinks( $template );
} else {
- $template->data['banners'] = array(
self::renderBanner( $config, null, null, false ) );
+ $template->data['banners'] = array(
self::renderBanner( $config, $out, false, null, null ) );
$template->set( 'banners',
$template->data['banners'] );
self::rewriteLangLinks( $template, $config,
$redirectWarningQPS, $req );
}
@@ -126,7 +126,7 @@
if ( isset( $warning ) ) {
$notice = $warning;
} else {
- $notice = self::renderBanner( $config, null, null, true
);
+ $notice = self::renderBanner( $config, $wgOut, true,
null, null );
}
return true;
@@ -281,12 +281,22 @@
/**
* @param $config
+ * @param OutputPage $out
+ * @param bool $wap
* @param Language $lang
* @param string $sitename
- * @param bool $wap
* @return string
*/
- public static function renderBanner( $config, $lang = null, $sitename =
null, $wap = false ) {
+ public static function renderBanner( $config, $out, $wap = false, $lang
= null, $sitename = null ) {
+
+ $isFilePage = $out->getTitle()->inNamespace( NS_FILE );
+ $isImageCharged = !$config['showImages'];
+ $isZeroDot = self::isZeroSubdomain();
+
+ if ( $isFilePage && $isImageCharged && $isZeroDot ) {
+ return '';
+ }
+
$bannerText = self::getBannerText( $config, $lang, $sitename );
if ( $bannerText !== false ) {
global $wgRequest;
diff --git a/includes/ZeroConfigContent.php b/includes/ZeroConfigContent.php
index e959767..0b313a2 100644
--- a/includes/ZeroConfigContent.php
+++ b/includes/ZeroConfigContent.php
@@ -9,6 +9,7 @@
use Title;
use User;
use Xml;
+use OutputPage;
/**
* Represents the content of a JSON Zero Config article.
@@ -161,6 +162,7 @@
private function renderBanners( $conf ) {
global $wgConf;
+ global $wgOut;
wfProfileIn( __METHOD__ );
$wgConf->loadFullData();
@@ -179,7 +181,7 @@
// Get localized "wikipedia" sitename. If null, will
use default {{SITENAME}}
$sitename = $wgConf->get( 'wgSitename', str_replace(
'-', '_', $langCode ) . 'wiki' );
$td = $td = Xml::tags( 'td', null,
- PageRenderingHooks::renderBanner( $conf, $lang,
$sitename ) );
+ PageRenderingHooks::renderBanner( $conf,
$wgOut, false, $lang, $sitename ) );
$rows[] = Xml::tags( 'tr', null, $th . $td );
}
$res = Xml::tags( 'table', array( 'class' =>
'mw-zero-config-banners' ),
--
To view, visit https://gerrit.wikimedia.org/r/71738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I466c387f4939138be461442cba969c819eef1d75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
