jenkins-bot has submitted this change and it was merged.

Change subject: Override CentralAuth cookie domains for commons/meta to work 
with mobile
......................................................................


Override CentralAuth cookie domains for commons/meta to work with mobile

Bug: 47647
Change-Id: I8d62245cb2764790e0e0fb2ade06f52a53a383c3
---
M wmf-config/mobile.php
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  MaxSem: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 0be902c..c20bbfa 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -110,13 +110,20 @@
 
 // Hack to work around https://bugzilla.wikimedia.org/show_bug.cgi?id=35215
 $wgHooks['EnterMobileMode'][] = function() {
-       global $wgCentralHost, $wgCentralPagePath, $wgCentralBannerDispatcher, 
$wgCentralBannerRecorder;
+       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;
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/61941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d62245cb2764790e0e0fb2ade06f52a53a383c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: awjrichards <[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

Reply via email to