jenkins-bot has submitted this change and it was merged.
Change subject: Correct returnto on Special:UserLogout
......................................................................
Correct returnto on Special:UserLogout
If you clicked the login link while on Special:UserLogout (you want to
immediately login as another usre), you were redirected to
Special:Logout as soon as you logged in via OAuth, so the user was
immediatly logged out.
Change-Id: Id3af65e32a32bb7fcf9cd94635f9d84192b8ea03
---
M utils/Hooks.php
1 file changed, 14 insertions(+), 7 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/Hooks.php b/utils/Hooks.php
index 6df4a81..23c207d 100644
--- a/utils/Hooks.php
+++ b/utils/Hooks.php
@@ -8,14 +8,21 @@
$wgOAuthAuthenticationAllowLocalUsers,
$wgOAuthAuthenticationRemoteName;
if ( $wgUser->getID() == 0 ) {
+
$query = array();
- $query['returnto'] = $title->getPrefixedText();
- $returntoquery = $wgRequest->getValues();
- unset( $returntoquery['title'] );
- unset( $returntoquery['returnto'] );
- unset( $returntoquery['returntoquery'] );
- $query['returntoquery'] = wfArrayToCgi( $returntoquery
);
- $personal_urls['login']['href'] =
\SpecialPage::getTitleFor( 'OAuthLogin', 'init' )->getFullURL( $query );
+ if ( $title->isSpecial( 'Userlogout' ) ) {
+ $query['returnto'] = $wgRequest->getVal(
'returnto', 'Main_Page' );
+ $query['returntoquery'] = $wgRequest->getVal(
'returntoquery' );
+ } else {
+ $query['returnto'] = $title->getPrefixedText();
+ $returntoquery = $wgRequest->getValues();
+ unset( $returntoquery['title'] );
+ unset( $returntoquery['returnto'] );
+ unset( $returntoquery['returntoquery'] );
+ $query['returntoquery'] = wfArrayToCgi(
$returntoquery );
+ }
+ $personal_urls['login']['href'] =
+ \SpecialPage::getTitleFor( 'OAuthLogin', 'init'
)->getFullURL( $query );
if ( $wgOAuthAuthenticationRemoteName ) {
$personal_urls['login']['text'] = wfMessage(
'oauthauth-login',
$wgOAuthAuthenticationRemoteName
)->text();
--
To view, visit https://gerrit.wikimedia.org/r/174439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3af65e32a32bb7fcf9cd94635f9d84192b8ea03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
