jenkins-bot has submitted this change and it was merged.
Change subject: Remove source of a possible redirect loop
......................................................................
Remove source of a possible redirect loop
Rather than handle this in MobileFrontend use the same mechanism
core and desktop use.
Change-Id: I1368948a4cb8e43eaf9c6608506c9a034a690adb
---
M includes/MobileFrontend.hooks.php
1 file changed, 0 insertions(+), 16 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 264bd64..f5c1e0a 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -644,22 +644,6 @@
} elseif ( $name === 'Userlogin' ) {
$out->addModuleStyles(
'skins.minerva.special.userlogin.styles' );
$out->addModules(
'mobile.special.userlogin.scripts' );
- // make sure we're on https if we're supposed
to be and currently aren't.
- // most of this is lifted from https redirect
code in SpecialUserlogin::execute()
- // also, checking for 'https' in $wgServer is a
little funky, but this is what
- // is done on the WMF cluster (see config in
CommonSettings.php)
- if ( $secureLogin &&
WebRequest::detectProtocol() != 'https' ) {
- // get the https url and redirect
- $query =
$special->getContext()->getRequest()->getQueryValues();
- if ( isset( $query['title'] ) ) {
- unset( $query['title'] );
- }
- $url = $mobileContext->getMobileUrl(
-
$special->getFullTitle()->getFullURL( $query ),
- true
- );
-
$special->getContext()->getOutput()->redirect( $url );
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/277914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1368948a4cb8e43eaf9c6608506c9a034a690adb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
