jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/322439 )
Change subject: Check if a property exist before accessing it
......................................................................
Check if a property exist before accessing it
Bug: T151126
Change-Id: I301bdc939ffaafcd1cb54bab22606c6411b01520
---
M includes/specials/SpecialGoogleLoginReturn.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
MtDu: Looks good to me, but someone else must approve
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialGoogleLoginReturn.php
b/includes/specials/SpecialGoogleLoginReturn.php
index 34fe10b..f789d17 100644
--- a/includes/specials/SpecialGoogleLoginReturn.php
+++ b/includes/specials/SpecialGoogleLoginReturn.php
@@ -29,7 +29,10 @@
$this->setHeaders();
$authData = $session->getSecret( 'authData' );
$token = $session->getToken(
GooglePrimaryAuthenticationProvider::TOKEN_SALT );
- $redirectUrl =
$authData[GooglePrimaryAuthenticationProvider::RETURNURL_SESSION_KEY];
+ $redirectUrl =
+ isset(
$authData[GooglePrimaryAuthenticationProvider::RETURNURL_SESSION_KEY] )
+ ?
$authData[GooglePrimaryAuthenticationProvider::RETURNURL_SESSION_KEY]
+ : false;
if ( !$redirectUrl || !$token->match( $request->getVal( 'state'
) ) ) {
$out->redirect( SpecialPage::getTitleFor( 'UserLogin'
)->getLocalURL() );
return;
--
To view, visit https://gerrit.wikimedia.org/r/322439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I301bdc939ffaafcd1cb54bab22606c6411b01520
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: MtDu <justin.d...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
