jenkins-bot has submitted this change and it was merged.
Change subject: temp tevert "Add 2 new hooks to fix mobile logins" - testing
......................................................................
temp tevert "Add 2 new hooks to fix mobile logins" - testing
This reverts commit ef125c993b61e5eb39e3bf8429239ce4951eeb68.
Change-Id: If467f8043d9ae0d2343f209eb8f9d8786de98382
---
M CentralAuthHooks.php
M specials/SpecialCentralLogin.php
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index 62db3d2..1fb8463 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
@@ -437,7 +437,6 @@
'finalProto' => $finalProto,
'currentProto' => $request->detectProtocol()
);
- wfRunHooks( 'CentralAuthLoginRedirectData', array(
$centralUser, &$data ) );
$wgMemc->set( $key, $data, 60 );
$wiki = WikiMap::getWiki( $wgCentralAuthLoginWiki );
diff --git a/specials/SpecialCentralLogin.php b/specials/SpecialCentralLogin.php
index 96501ce..272018c 100644
--- a/specials/SpecialCentralLogin.php
+++ b/specials/SpecialCentralLogin.php
@@ -109,9 +109,9 @@
$url = $info['currentProto'] . ':' . $url;
if ( $wgCentralAuthSilentLogin ) {
- $url = wfAppendQuery( $url, array( 'token' => $token )
); // expands to PROTO_CURRENT if $url doesn't have protocol
- wfRunHooks( 'CentralAuthSilentLoginRedirect', array(
$centralUser, &$url, $info ) );
- $this->getOutput()->redirect( $url );
+ $this->getOutput()->redirect( // expands to
PROTO_CURRENT if $url doesn't have protocol
+ wfAppendQuery( $url, array( 'token' => $token )
)
+ );
} else {
$this->getOutput()->addHtml(
Xml::openElement( 'form',
--
To view, visit https://gerrit.wikimedia.org/r/75784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If467f8043d9ae0d2343f209eb8f9d8786de98382
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[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
