https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114292
Revision: 114292
Author: preilly
Date: 2012-03-20 18:24:03 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
1.19wmf: MFT r114291
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-20 18:21:06 UTC (rev 114291)
+++
branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
2012-03-20 18:24:03 UTC (rev 114292)
@@ -32,7 +32,12 @@
private static $debugOutput = array();
private static $displayDebugOutput = false;
private static $formatMobileUrl = '//%s.m.wikipedia.org/';
+
+ /**
+ * @var Title
+ */
private static $title;
+
private static $isFilePage;
public static $isMainPage = false;
private static $acceptBilling;
@@ -55,7 +60,7 @@
* @return bool
*/
public function beforePageDisplayHTML( &$out, &$text ) {
- global $wgRequest, $wgConf,
$wgEnableZeroRatedMobileAccessTesting, $wgZeroDisableImages, $wgSitename;
+ global $wgRequest, $wgConf,
$wgEnableZeroRatedMobileAccessTesting, $wgZeroDisableImages;
wfProfileIn( __METHOD__ );
$DB = wfGetDB( DB_MASTER );
@@ -110,10 +115,10 @@
}
if ( self::$isFilePage && self::$acceptBilling !==
'yes' && self::$renderZeroRatedBanner === true ) {
+ $referrer = $wgRequest->getHeader( 'referer' );
$acceptBillingYes = Html::rawElement( 'a',
array( 'href' => str_replace(
'.wikipedia.org/', '.m.wikipedia.org/', wfExpandUrl( $wgRequest->appendQuery(
'acceptbilling=yes' . urlencode( $referrer ) ), PROTO_CURRENT ) ) ),
wfMsg(
'zero-rated-mobile-access-banner-text-data-charges-yes' ) );
- $referrer = $wgRequest->getHeader( 'referer' );
$acceptBillingNo = Html::rawElement( 'a',
array( 'href' =>
$wgRequest->appendQuery( 'acceptbilling=no&returnto=' . urlencode( $referrer )
) ),
wfMsg(
'zero-rated-mobile-access-banner-text-data-charges-no' ) );
@@ -210,6 +215,7 @@
wfMessage(
'zero-rated-mobile-access-home-page-selection',
$languageName
)->inLanguage( $languageCode )
);
+ $languageLink = str_replace(
'.m.wikipedia.org', '.zero.wikipedia.org', $languageLink );
$output .= Html::rawElement(
'h3', array( 'id' => 'lang_' . $languageCode ), $languageLink );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
