jenkins-bot has submitted this change and it was merged.
Change subject: Another debugging checkin for beta cluster
......................................................................
Another debugging checkin for beta cluster
Change-Id: I96e79fbcbd18fc4867b819c42747a54f506d5b1d
---
M includes/PageRenderingHooks.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 4934733..fa42a6b 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -422,16 +422,16 @@
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
$esiHeader = $this->request->getHeader( 'X-FORCE-ESI' );
- if ( $esiHeader === 'TMP1' ) {
- return '<esi:include
src="http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
- } elseif ( $esiHeader === 'TMP2' ) {
- return '<esi:include
src="http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
- }
-
if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this->request->response()->header( 'Enable-ESI: 1' );
+ if ( $esiHeader === 'TMP1' ) {
+ return '<esi:include
src="http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ } elseif ( $esiHeader === 'TMP2' ) {
+ return '<esi:include
src="http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ }
+
$special = SpecialPage::getTitleFor(
'ZeroRatedMobileAccess' );
$query = 'renderesibanner=1';
if ( $wap ) {
--
To view, visit https://gerrit.wikimedia.org/r/92274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96e79fbcbd18fc4867b819c42747a54f506d5b1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
