From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 16 Feb 2016 17:13:32 +0000 (-0500)
Subject: CookieSessionProvider: It's persisted if we have a 'Token' cookie
X-Git-Tag: 1.31.0-rc.0~7938^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=220ec673f57501ad83805ae8d6c45d922bff1f2d;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
index f55c589036..8d7830b077 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -148,6 +148,7 @@ class CookieSessionProvider extends SessionProvider {
 					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 ff40aa5a5d..9c4a2bd47f 100644
--- a/includes/session/SessionInfo.php
+++ b/includes/session/SessionInfo.php
@@ -203,9 +203,6 @@ class SessionInfo {
 
 	/**
 	 * Return whether the session is persisted
-	 *
-	 * i.e. a session ID was given to the constuctor
-	 *
 	 * @return bool
 	 */
 	final public function wasPersisted() {