MarkAHershberger has submitted this change and it was merged.
Change subject: Fix login with temporary password with $wgSecureLogin = true
......................................................................
Fix login with temporary password with $wgSecureLogin = true
The problem is that FauxRequest sets the protocol to http by default,
thus triggering the redirect when executing Special:UserLogin in the
background to log the user in after having reset his password.
DerivativeRequest is now used instead of FauxRequest so that the
protocol is correctly forwarded, and the redirect will not be
triggered.
Bug: 57289
Change-Id: I252351ff7d446283c9d1ab5f79b5cdbce71b76e0
---
M includes/specials/SpecialChangePassword.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialChangePassword.php
b/includes/specials/SpecialChangePassword.php
index 8b96e6c..43a4d2c 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -99,7 +99,7 @@
'wpLoginToken' => $token,
'wpPassword' =>
$request->getVal( 'wpNewPassword' ),
) + $request->getValues( 'wpRemember',
'returnto', 'returntoquery' );
- $login = new LoginForm( new
FauxRequest( $data, true ) );
+ $login = new LoginForm( new
DerivativeRequest( $request, $data, true ) );
$login->setContext( $this->getContext()
);
$login->execute( null );
}
--
To view, visit https://gerrit.wikimedia.org/r/96970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I252351ff7d446283c9d1ab5f79b5cdbce71b76e0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <coderev...@emsenhuber.ch>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: MarkAHershberger <mhershber...@wikimedia.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Wikinaut <m...@tgries.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
