diff options
| author | Brad Jorsch <bjorsch@wikimedia.org> | 2016-02-16 12:13:32 -0500 |
|---|---|---|
| committer | Brad Jorsch <bjorsch@wikimedia.org> | 2016-02-16 12:13:32 -0500 |
| commit | 220ec673f57501ad83805ae8d6c45d922bff1f2d (patch) | |
| tree | f2ae04a58aa2d7fbad1d8768719a5e6384860bf5 /includes/session | |
| parent | 014540547b743290155ae6999d97c173aaaddea0 (diff) | |
| download | mediawikicore-220ec673f57501ad83805ae8d6c45d922bff1f2d.tar.gz mediawikicore-220ec673f57501ad83805ae8d6c45d922bff1f2d.zip | |
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
Diffstat (limited to 'includes/session')
| -rw-r--r-- | includes/session/CookieSessionProvider.php | 1 | ||||
| -rw-r--r-- | includes/session/SessionInfo.php | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php index f55c5890365a..8d7830b07736 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 ff40aa5a5d2b..9c4a2bd47fbf 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() { |