| Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php |
| — | — | @@ -78,8 +78,6 @@ |
| 79 | 79 | return true; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | | - $output = ''; |
| 83 | | - |
| 84 | 82 | self::$renderZeroRatedLandingPage = $wgRequest->getFuzzyBool( 'renderZeroRatedLandingPage' ); |
| 85 | 83 | self::$renderZeroRatedBanner = $wgRequest->getFuzzyBool( 'renderZeroRatedBanner' ); |
| 86 | 84 | self::$renderZeroRatedRedirect = $wgRequest->getFuzzyBool( 'renderZeroRatedRedirect' ); |
| — | — | @@ -96,6 +94,13 @@ |
| 97 | 95 | self::$renderZeroRatedBanner = true; |
| 98 | 96 | } |
| 99 | 97 | |
| | 98 | + if ( !self::$renderZeroRatedLandingPage && !self::$renderZeroRatedBanner ) { |
| | 99 | + wfProfileOut( __METHOD__ ); |
| | 100 | + return true; |
| | 101 | + } |
| | 102 | + |
| | 103 | + $output = ''; |
| | 104 | + |
| 100 | 105 | if ( self::$title->getNamespace() == NS_FILE ) { |
| 101 | 106 | self::$isFilePage = true; |
| 102 | 107 | } |
| — | — | @@ -202,6 +207,11 @@ |
| 203 | 208 | } |
| 204 | 209 | self::addDebugOutput( $country ); |
| 205 | 210 | } |
| | 211 | + |
| | 212 | + if ( isset( self::$carrier['name'] ) && stristr( self::$carrier['name'], 'DIGI' ) !== FALSE ) { |
| | 213 | + $country = 'MY'; |
| | 214 | + } |
| | 215 | + |
| 206 | 216 | $languageOptions = $this->createLanguageOptionsFromWikiText(); |
| 207 | 217 | // self::$displayDebugOutput = true; |
| 208 | 218 | $languagesForCountry = ( isset( $languageOptions[self::getFullCountryNameFromCode( $country )] ) ) ? |