https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114426
Revision: 114426
Author: preilly
Date: 2012-03-22 18:07:15 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
1.19wmf: MFG Change-Id:
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
Modified:
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-03-22 17:43:17 UTC (rev 114425)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-03-22 18:07:15 UTC (rev 114426)
@@ -78,8 +78,6 @@
return true;
}
- $output = '';
-
self::$renderZeroRatedLandingPage =
$wgRequest->getFuzzyBool( 'renderZeroRatedLandingPage' );
self::$renderZeroRatedBanner =
$wgRequest->getFuzzyBool( 'renderZeroRatedBanner' );
self::$renderZeroRatedRedirect =
$wgRequest->getFuzzyBool( 'renderZeroRatedRedirect' );
@@ -96,6 +94,13 @@
self::$renderZeroRatedBanner = true;
}
+ if ( !self::$renderZeroRatedLandingPage &&
!self::$renderZeroRatedBanner ) {
+ wfProfileOut( __METHOD__ );
+ return true;
+ }
+
+ $output = '';
+
if ( self::$title->getNamespace() == NS_FILE ) {
self::$isFilePage = true;
}
@@ -202,6 +207,11 @@
}
self::addDebugOutput( $country );
}
+
+ if ( isset( self::$carrier['name'] ) &&
stristr( self::$carrier['name'], 'DIGI' ) !== FALSE ) {
+ $country = 'MY';
+ }
+
$languageOptions =
$this->createLanguageOptionsFromWikiText();
// self::$displayDebugOutput = true;
$languagesForCountry = ( isset(
$languageOptions[self::getFullCountryNameFromCode( $country )] ) ) ?
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
