jenkins-bot has submitted this change and it was merged.
Change subject: Use session_id() instead of $wgSessionStarted to check for
session existence
......................................................................
Use session_id() instead of $wgSessionStarted to check for session existence
More reliable check and so that $wgSessionStarted can be removed at some point.
Change-Id: I6541b52d090b0ea3f17c987ed2595d086bd1c3a1
---
M SocialLogin.body.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SocialLogin.body.php b/SocialLogin.body.php
index 7fde436..e0b55a9 100644
--- a/SocialLogin.body.php
+++ b/SocialLogin.body.php
@@ -102,8 +102,8 @@
}
function onUserLoadAfterLoadFromSession( $user ) {
- global $wgRequest, $wgOut, $wgContLang, $wgSocialLoginServices,
$wgSocialLoginAddForms, $wgSessionStarted;
- if (!$wgSessionStarted) {
+ global $wgRequest, $wgOut, $wgContLang, $wgSocialLoginServices,
$wgSocialLoginAddForms;
+ if (session_id() == '') {
wfSetupSession();
}
$action = $wgRequest->getText('action', 'auth');
@@ -344,4 +344,4 @@
$wgOut->addHeadItem('Zocial Styles', "<link type='text/css'
href='/extensions/SocialLogin/css/style.css' rel='stylesheet' />");
$this->setHeaders();
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/121250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6541b52d090b0ea3f17c987ed2595d086bd1c3a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SocialLogin
Gerrit-Branch: master
Gerrit-Owner: IAlex <coderev...@emsenhuber.ch>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Luft-on <luf...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
