| Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | * @return bool |
| 55 | 55 | */ |
| 56 | 56 | public function beforePageDisplayHTML( &$out, &$text ) { |
| 57 | | - global $wgRequest, $wgConf, $wgEnableZeroRatedMobileAccessTesting; |
| | 57 | + global $wgRequest, $wgConf, $wgEnableZeroRatedMobileAccessTesting, $wgZeroDisableImages; |
| 58 | 58 | wfProfileIn( __METHOD__ ); |
| 59 | 59 | |
| 60 | 60 | $DB = wfGetDB( DB_MASTER ); |
| — | — | @@ -139,6 +139,9 @@ |
| 140 | 140 | } elseif ( self::$renderZeroRatedBanner === true ) { |
| 141 | 141 | self::$carrier = $this->lookupCarrier( $carrier ); |
| 142 | 142 | if ( isset( self::$carrier['name'] ) ) { |
| | 143 | + if ( $wgZeroDisableImages === 1 ) { |
| | 144 | + self::$forceClickToViewImages = $wgZeroDisableImages; |
| | 145 | + } |
| 143 | 146 | $html = $out->getHTML(); |
| 144 | 147 | $parsedHtml = $this->parseLinksForZeroQueryString( $html ); |
| 145 | 148 | $out->clearHTML(); |