Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64100
Change subject: (Bug 48528) Fix bug with null Zero config
......................................................................
(Bug 48528) Fix bug with null Zero config
* when renderZeroRatedBanner=true in URL, but the incoming request is not
marked with X-CS parameter, avoids null-ref warning and blanking out of the page
Change-Id: I381b5c2a9e1e6373569aefeb2a6dc897cc9f16ce
---
M includes/PageRenderingHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/00/64100/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index c2aef24..7775d6a 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -113,7 +113,7 @@
$output = self::renderZeroRedirect();
$out->clearHTML();
$out->setPageTitle( null );
- } elseif ( $renderBanner ) {
+ } elseif ( $renderBanner && $config !== null ) {
$imgHeader = self::disableImages() ? 'X-Images: no' :
'X-Images: yes';
$wgRequest->response()->header( $imgHeader );
$html = $out->getHTML();
--
To view, visit https://gerrit.wikimedia.org/r/64100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I381b5c2a9e1e6373569aefeb2a6dc897cc9f16ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
