From b9e91835ec9d8d66e94452c676a632ac9887a6c7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 7 Nov 2011 22:43:57 -0600 Subject: [PATCH] fix bug in session class. --- laravel/session.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/laravel/session.php b/laravel/session.php index 77cc5c59..67a53055 100644 --- a/laravel/session.php +++ b/laravel/session.php @@ -38,7 +38,7 @@ public static function start(Driver $driver) static::$session = $driver->load($id); } - if (static::invalid()) + if (is_null(static::$session) or static::invalid()) { static::$exists = false; @@ -66,9 +66,7 @@ protected static function invalid() { $lifetime = Config::$items['session']['lifetime']; - $idle = time() - static::$session['last_activity']; - - return is_null(static::$session) or ($idle > ($lifetime * 60)); + return (time() - static::$session['last_activity']) > ($lifetime * 60); } /**