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_native.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_native.php')
| -rwxr-xr-x | system/libraries/Session/drivers/Session_native.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; |