diff options
| author | Florian Pritz <bluewind@xinu.at> | 2021-02-21 11:18:58 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2021-02-21 11:18:58 +0100 |
| commit | 08510ba2faa4785339ca7093ba0fa7052ff5d0c8 (patch) | |
| tree | 108365fe3624295d70a677642b300fd458e7c569 /system/libraries/Session/Session.php | |
| parent | 29e6c8ad462a426f4bc6d380646e434e3361a21d (diff) | |
| parent | 0925b5099919300a239909588351a6482c5e792d (diff) | |
PHP8: Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Session/Session.php')
| -rw-r--r-- | system/libraries/Session/Session.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index 9b834f86a..06b953ab2 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -44,7 +44,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @subpackage Libraries * @category Sessions * @author Andrey Andreev - * @link https://codeigniter.com/user_guide/libraries/sessions.html + * @link https://codeigniter.com/userguide3/libraries/sessions.html */ class CI_Session { @@ -415,9 +415,7 @@ class CI_Session { { $_SESSION['__ci_vars'][$key] = 'old'; } - // Hacky, but 'old' will (implicitly) always be less than time() ;) - // DO NOT move this above the 'new' check! - elseif ($value < $current_time) + elseif ($value === 'old' || $value < $current_time) { unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]); } |