reverting to previous solution plus added check in driver

Tenga · Oct 26, 2011 · f25e1da · f25e1da
1 parent 34ac196
commit f25e1da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/classes/warden/driver.php b/classes/warden/driver.php
@@ -66,7 +66,7 @@ public function logged_in($role = null)
                 'where' => array('authentication_token' => $auth_token)
             ));
 
-            if (!is_null($user)) {
+            if ($user && !$user->is_access_locked()) {
                 $this->set_user($user);
             }
         }

diff --git a/classes/warden/model/user.php b/classes/warden/model/user.php
@@ -579,7 +579,8 @@ public function lock_access()
         // Revoke authentication token
         $this->authentication_token = null;
 
-        return $this->save(false);
+        // Save and make sure session is destroyed completely
+        return $this->save(false) && Warden::logout(true);
     }
 
     /**