Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64269
Change subject: Renamed $render* to $show* variables, del dbg flag
......................................................................
Renamed $render* to $show* variables, del dbg flag
* Renamed all $renderXXX variables to $showXXX
* Removed unused debug flag renderZeroRatedLandingPage (can be simulated with
headers)
* Cleaned up README obsolete flags
Change-Id: I7c8399c3f693d8df02aade08008aac32b6f6dcd6
---
M README
M includes/PageRenderingHooks.php
2 files changed, 12 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/69/64269/1
diff --git a/README b/README
index ddad668..ddedb86 100644
--- a/README
+++ b/README
@@ -114,7 +114,5 @@
To test the landing page, go to /wiki/Special:ZeroRatedMobileAccess
Append various fun things on the URL...
-* ?renderZeroRatedLandingPage=true
* ?renderZeroRatedBanner=true
* ?renderZeroRatedRedirect=true
-* ?forceClickToViewImages=true
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 55421b9..35b6efa 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -72,8 +72,8 @@
$isFilePage = $out->getTitle()->inNamespace( NS_FILE );
$config = self::getConfig();
- $renderBanner = $config !== null || $wgRequest->getFuzzyBool(
'renderZeroRatedBanner' );
- if ( !$renderBanner && self::isZeroRequest() &&
!$wgRequest->getFuzzyBool( 'renderZeroRatedLandingPage' ) ) {
+ $showBanner = $config !== null || $wgRequest->getFuzzyBool(
'renderZeroRatedBanner' );
+ if ( !$showBanner && self::isZeroRequest() ) {
$out->clearHTML();
$out->setPageTitle( null );
$out->addHTML( self::renderUnknownCarrier() );
@@ -81,9 +81,9 @@
return true;
}
- if ( $renderBanner && $config === null ) {
+ if ( $showBanner && $config === null ) {
// This should never happen - attempt to debug it
- $dbg = "renderBanner && !config\t" .
$wgRequest->getIP() . "\t" . $wgRequest->getFullRequestURL();
+ $dbg = "showBanner && !config\t" . $wgRequest->getIP()
. "\t" . $wgRequest->getFullRequestURL();
$dbg .= "\nHeaders: " . print_r(
$wgRequest->getAllHeaders(), true );
wfDebugLog( 'zero', $dbg );
}
@@ -98,23 +98,23 @@
}
}
- $renderWarning = false;
+ $showWarning = false;
if ( $isFilePage ) {
- $renderWarning = $config === null ||
!$config['showImages'];
+ $showWarning = $config === null ||
!$config['showImages'];
} else {
- $renderWarningFlag = $wgRequest->getVal(
'renderwarning' );
- if ( $renderWarningFlag === 'yes' ) {
- $renderWarning = true;
+ $showWarningFlag = $wgRequest->getVal( 'renderwarning'
);
+ if ( $showWarningFlag === 'yes' ) {
+ $showWarning = true;
}
}
- if ( $renderBanner && $config !== null ) {
+ if ( $showBanner && $config !== null ) {
$options = array();
$options['toggle_view_desktop'] =
'&renderZeroRatedBanner=true&renderwarning=yes&returnto=';
$options['supported_languages'] = $config['showLangs'];
}
- if ( $renderBanner && $renderWarning && $acceptBilling !==
'yes' ) {
+ if ( $showBanner && $showWarning && $acceptBilling !== 'yes' ) {
$output = self::renderQuestion(
str_replace(
'.wikipedia.org/',
@@ -133,7 +133,7 @@
);
$out->clearHTML();
$out->setPageTitle( null );
- } elseif ( $renderBanner && $config !== null ) {
+ } elseif ( $showBanner && $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/64269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c8399c3f693d8df02aade08008aac32b6f6dcd6
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
