diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-10-15 10:12:37 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-10-15 10:12:37 +0200 |
commit | 02117680c8a3a4c7da2b10e25fc6c29fd5fa9bd2 (patch) | |
tree | 5a63946c78e1e65a9eba848e4d3e2d806b123dfa /system | |
parent | 37c85d73c4428bd19fafbba33992649fc29946d5 (diff) |
Partially fix #1702
Diffstat (limited to 'system')
-rwxr-xr-x | system/libraries/Session/drivers/Session_cookie.php | 2 | ||||
-rwxr-xr-x | system/libraries/Session/drivers/Session_native.php | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/system/libraries/Session/drivers/Session_native.php b/system/libraries/Session/drivers/Session_native.php index 8d5e51546..6529d4c36 100755 --- a/system/libraries/Session/drivers/Session_native.php +++ b/system/libraries/Session/drivers/Session_native.php @@ -107,7 +107,7 @@ class CI_Session_native extends CI_Session_driver { // Check session expiration, ip, and agent $now = time(); $destroy = FALSE; - if (isset($_SESSION['last_activity']) && ($_SESSION['last_activity'] + $expire) < $now) + if (isset($_SESSION['last_activity']) && (($_SESSION['last_activity'] + $expire) < $now OR $_SESSION['last_activity'] > $now)) { // Expired - destroy $destroy = TRUE; |