diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-15 22:55:11 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-15 22:55:11 +0200 |
| commit | 63391f7db5811c5569246a713df456d602cbad13 (patch) | |
| tree | 190bdf9317c42bb2453faa88ef7b6455db1f2032 /system/libraries/Session/drivers/Session_cookie.php | |
| parent | e3621cc79fa4b4658768fea0694cc0ae52835d85 (diff) | |
| parent | c7719284833f211984474623832b96707173e02d (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/libraries/Session/drivers/Session_cookie.php')
| -rwxr-xr-x | system/libraries/Session/drivers/Session_cookie.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php index fb62c7ec4..5bb1f7aa6 100755 --- a/system/libraries/Session/drivers/Session_cookie.php +++ b/system/libraries/Session/drivers/Session_cookie.php @@ -405,7 +405,7 @@ class CI_Session_cookie extends CI_Session_driver { } // Is the session current? - if (($session['last_activity'] + $this->sess_expiration) < $this->now) + if (($session['last_activity'] + $this->sess_expiration) < $this->now OR $session['last_activity'] > $this->now) { $this->sess_destroy(); return FALSE; |