Merge "CookieSessionProvider: It's persisted if we have a 'Token' cookie"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Feb 2016 23:55:44 +0000 (23:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Feb 2016 23:55:44 +0000 (23:55 +0000)
includes/session/CookieSessionProvider.php
includes/session/SessionInfo.php

index f55c589..8d7830b 100644 (file)
@@ -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 {
index ff40aa5..9c4a2bd 100644 (file)
@@ -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() {