jenkins-bot has submitted this change and it was merged.
Change subject: Murderdeathkill bits special casing for mobile
......................................................................
Murderdeathkill bits special casing for mobile
Change-Id: If625256c46d5e948b6226d2dc6d6895725413bf3
---
M wmf-config/InitialiseSettings.php
M wmf-config/mobile.php
2 files changed, 0 insertions(+), 30 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 28b4b5e..ab1dc44 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11082,10 +11082,6 @@
'wmgMFEnableXAnalyticsLogging' => array(
'default' => true,
),
-'wmgMFVaryResources' => array(
- 'default' => true,
- 'testwiki' => true,
-),
'wmgMFEnableSiteNotice' => array(
'default' => true,
),
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index b6a8bb0..62620b3 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -25,32 +25,6 @@
}
$wgMFCustomLogos = $wmgMFCustomLogos;
}
-
- // Point mobile load.php requests to a special path on bits that gets
X-Device headers
- function wmfSetupMobileLoadScript() {
- global $wgDBname, $wgLoadScript;
- static $initialised = false;
-
- if ( !$initialised &&
MobileContext::singleton()->shouldDisplayMobileView() ) {
- if ( $wgDBname === 'testwiki' ) {
- // testwiki's resources aren't loaded from
bits, it just needs a mobile domain
- $wgLoadScript =
'//test.m.wikipedia.org/w/load.php';
- } else {
- $wgLoadScript = str_replace(
'bits.wikimedia.org/', 'bits.wikimedia.org/m/', $wgLoadScript );
- }
- }
- $initialised = true;
- }
-
- // Enable $wgMFVaryResources only if there's a mobile site (otherwise
we'll end up
- // looking for X-WAP headers in requests coming from Squid
- if ( $wmgMFVaryResources ) {
- $wgMFVaryResources = true;
- $wgHooks['BeforeInitialize'][] =
$wgHooks['ResourceLoaderRegisterModules'][] = function() {
- wmfSetupMobileLoadScript();
- return true;
- };
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/72983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If625256c46d5e948b6226d2dc6d6895725413bf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
