jenkins-bot has submitted this change and it was merged.
Change subject: CookieSessionProvider: It's persisted if we have a 'Token'
cookie
......................................................................
CookieSessionProvider: It's persisted if we have a 'Token' cookie
This aspect of the pre-SessionManager Setup.php code had been
overlooked.
This also updates an inaccurate doc comment that I happened to notice.
Bug: T125313
Change-Id: Id49836086be837012b02885ce5384ae6a4ebc105
(cherry picked from commit 220ec673f57501ad83805ae8d6c45d922bff1f2d)
---
M includes/session/CookieSessionProvider.php
M includes/session/SessionInfo.php
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/session/CookieSessionProvider.php
b/includes/session/CookieSessionProvider.php
index f55c589..8d7830b 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -148,6 +148,7 @@
return null;
}
$info['userInfo'] = $userInfo->verified();
+ $info['persisted'] = true; // If we have
user+token, it should be
} elseif ( isset( $info['id'] ) ) {
$info['userInfo'] = $userInfo;
} else {
diff --git a/includes/session/SessionInfo.php b/includes/session/SessionInfo.php
index ff40aa5..9c4a2bd 100644
--- a/includes/session/SessionInfo.php
+++ b/includes/session/SessionInfo.php
@@ -203,9 +203,6 @@
/**
* Return whether the session is persisted
- *
- * i.e. a session ID was given to the constuctor
- *
* @return bool
*/
final public function wasPersisted() {
--
To view, visit https://gerrit.wikimedia.org/r/272826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id49836086be837012b02885ce5384ae6a4ebc105
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.14
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
