jenkins-bot has submitted this change and it was merged.
Change subject: Wrap all mobile.php in MF existence check
......................................................................
Wrap all mobile.php in MF existence check
Change-Id: I893f30f98338b82f91ff6be6b1f31afff7bdaa3c
---
M wmf-config/mobile.php
1 file changed, 53 insertions(+), 54 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
Yurik: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 7dc0833..c3b1085 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -28,61 +28,60 @@
}
$wgMFCustomLogos = $wmgMFCustomLogos;
}
-}
-
-// If a URL template is set for MobileFrontend, use it.
-if ( $wmgMobileUrlTemplate ) {
- $wgMobileUrlTemplate = $wmgMobileUrlTemplate;
-}
-
-if ( $wmgZeroRatedMobileAccess ) {
- require_once(
"$IP/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php" );
- $wgZeroRatedMobileAccessConfigIndexUri =
'http://meta.wikimedia.org/w/index.php';
-}
-
-if ( $wmgZeroDisableImages ) {
- if ( isset( $_SERVER['HTTP_X_SUBDOMAIN'] ) && strtoupper(
$_SERVER['HTTP_X_SUBDOMAIN'] ) == 'ZERO' ) {
- $wgZeroDisableImages = $wmgZeroDisableImages;
- }
-}
-
-// Enable loading of desktop-specific resources from MobileFrontend
-if ( $wmgMFEnableDesktopResources ) {
- $wgMFEnableDesktopResources = true;
-}
-
-// Enable appending of TM (text) / (R) (icon) on site name in footer.
-$wgMFTrademarkSitename = $wmgMFTrademarkSitename;
-
-// Force HTTPS for login/account creation
-$wgMFForceSecureLogin = $wmgMFForceSecureLogin;
-
-// Enable X-Analytics logging
-$wgMFEnableXAnalyticsLogging = $wmgMFEnableXAnalyticsLogging;
-
-// Blacklist some pages
-$wgMFNoMobileCategory = $wmgMFNoMobileCategory;
-$wgMFNoMobilePages = $wmgMFNoMobilePages;
-
-// Hack to work around https://bugzilla.wikimedia.org/show_bug.cgi?id=35215
-$wgHooks['EnterMobileMode'][] = function() {
- global $wgCentralHost, $wgCentralPagePath, $wgCentralBannerDispatcher,
$wgCentralBannerRecorder, $wgCentralAuthCookieDomain;
-
- $wgCentralHost = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralHost );
- $wgCentralPagePath = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralPagePath );
- $wgCentralBannerDispatcher = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralBannerDispatcher );
- $wgCentralBannerRecorder = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralBannerRecorder );
-
- // Hack for bug https://bugzilla.wikimedia.org/show_bug.cgi?id=47647
- if ( $wgCentralAuthCookieDomain == 'commons.wikimedia.org' ) {
- $wgCentralAuthCookieDomain = 'commons.m.wikimedia.org';
- } elseif ( $wgCentralAuthCookieDomain == 'meta.wikimedia.org' ) {
- $wgCentralAuthCookieDomain = 'meta.m.wikimedia.org';
+ // If a URL template is set for MobileFrontend, use it.
+ if ( $wmgMobileUrlTemplate ) {
+ $wgMobileUrlTemplate = $wmgMobileUrlTemplate;
}
- return true;
-};
+ if ( $wmgZeroRatedMobileAccess ) {
+ require_once(
"$IP/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php" );
+ $wgZeroRatedMobileAccessConfigIndexUri =
'http://meta.wikimedia.org/w/index.php';
+ }
-$wgMFEnableSiteNotice = $wmgMFEnableSiteNotice;
-$wgMFEnablePhotoUploadCTA = $wmgMFEnablePhotoUploadCTA;
+ if ( $wmgZeroDisableImages ) {
+ if ( isset( $_SERVER['HTTP_X_SUBDOMAIN'] ) && strtoupper(
$_SERVER['HTTP_X_SUBDOMAIN'] ) == 'ZERO' ) {
+ $wgZeroDisableImages = $wmgZeroDisableImages;
+ }
+ }
+
+ // Enable loading of desktop-specific resources from MobileFrontend
+ if ( $wmgMFEnableDesktopResources ) {
+ $wgMFEnableDesktopResources = true;
+ }
+
+ // Enable appending of TM (text) / (R) (icon) on site name in footer.
+ $wgMFTrademarkSitename = $wmgMFTrademarkSitename;
+
+ // Force HTTPS for login/account creation
+ $wgMFForceSecureLogin = $wmgMFForceSecureLogin;
+
+ // Enable X-Analytics logging
+ $wgMFEnableXAnalyticsLogging = $wmgMFEnableXAnalyticsLogging;
+
+ // Blacklist some pages
+ $wgMFNoMobileCategory = $wmgMFNoMobileCategory;
+ $wgMFNoMobilePages = $wmgMFNoMobilePages;
+
+ // Hack to work around
https://bugzilla.wikimedia.org/show_bug.cgi?id=35215
+ $wgHooks['EnterMobileMode'][] = function() {
+ global $wgCentralHost, $wgCentralPagePath,
$wgCentralBannerDispatcher, $wgCentralBannerRecorder,
$wgCentralAuthCookieDomain;
+
+ $wgCentralHost = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralHost );
+ $wgCentralPagePath = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralPagePath );
+ $wgCentralBannerDispatcher = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralBannerDispatcher );
+ $wgCentralBannerRecorder = str_replace( 'meta.wikimedia.org',
'meta.m.wikimedia.org', $wgCentralBannerRecorder );
+
+ // Hack for bug
https://bugzilla.wikimedia.org/show_bug.cgi?id=47647
+ if ( $wgCentralAuthCookieDomain == 'commons.wikimedia.org' ) {
+ $wgCentralAuthCookieDomain = 'commons.m.wikimedia.org';
+ } elseif ( $wgCentralAuthCookieDomain == 'meta.wikimedia.org' )
{
+ $wgCentralAuthCookieDomain = 'meta.m.wikimedia.org';
+ }
+
+ return true;
+ };
+
+ $wgMFEnableSiteNotice = $wmgMFEnableSiteNotice;
+ $wgMFEnablePhotoUploadCTA = $wmgMFEnablePhotoUploadCTA;
+}
--
To view, visit https://gerrit.wikimedia.org/r/92811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I893f30f98338b82f91ff6be6b1f31afff7bdaa3c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
