jenkins-bot has submitted this change and it was merged.
Change subject: Apply mobile cookie domain fix to beta
......................................................................
Apply mobile cookie domain fix to beta
Bug: T49647
Bug: T142015
Change-Id: I7a3c641382d9300e001a3c7e439baabc02f582fa
---
M wmf-config/mobile-labs.php
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index 590df84..ff80d8d 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -21,3 +21,20 @@
$wgMFSpecialCaseMainPage = $wmgMFSpecialCaseMainPage;
$wgMFMobileFormatterHeadings = $wmgMFMobileFormatterHeadings;
+
+// T49647
+$wgHooks['EnterMobileMode'][] = function() {
+ global $wgCentralAuthCookieDomain, $wgHooks;
+ $domainRegexp = '/(?<!\.m)\.wikimedia\.beta\.wmflabs\.org$/';
+ $mobileDomain = '.m.wikimedia.beta.wmflabs.org';
+
+ if ( preg_match( $domainRegexp, $wgCentralAuthCookieDomain ) ) {
+ $wgCentralAuthCookieDomain = preg_replace( $domainRegexp,
$mobileDomain, $wgCentralAuthCookieDomain );
+ }
+ $wgHooks['WebResponseSetCookie'][] = function ( &$name, &$value,
&$expire, &$options ) use ( $domainRegexp, $mobileDomain ) {
+ if ( isset( $options['domain'] ) && preg_match( $domainRegexp,
$options['domain'] ) ) {
+ $options['domain'] = preg_replace( $domainRegexp,
$mobileDomain, $options['domain'] );
+ }
+ };
+};
+
--
To view, visit https://gerrit.wikimedia.org/r/303744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a3c641382d9300e001a3c7e439baabc02f582fa
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
