diff options
| author | Florian Pritz <bluewind@xinu.at> | 2022-04-10 11:46:21 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2022-04-10 11:46:21 +0200 |
| commit | b401c4e13863143b38b8848595566801fcc1527f (patch) | |
| tree | c6eae5ce18f519480ead73a16029dbf3c8e993aa /system/libraries/Session/Session_driver.php | |
| parent | 3deea564901d69109ddd6f757ccff84e6f113997 (diff) | |
| parent | 45576ef6e62b5ff59da67f1697ee8c57809c7719 (diff) | |
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Diffstat (limited to 'system/libraries/Session/Session_driver.php')
| -rw-r--r-- | system/libraries/Session/Session_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php index b1b1b073e..24b4b465e 100644 --- a/system/libraries/Session/Session_driver.php +++ b/system/libraries/Session/Session_driver.php @@ -122,7 +122,7 @@ abstract class CI_Session_driver { */ public function php5_validate_id() { - if (isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateSessionId($_COOKIE[$this->_config['cookie_name']])) + if ($this->_success === 0 && isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateId($_COOKIE[$this->_config['cookie_name']])) { unset($_COOKIE[$this->_config['cookie_name']]); } @@ -153,7 +153,7 @@ abstract class CI_Session_driver { return setcookie( $this->_config['cookie_name'], - NULL, + '', array( 'expires' => 1, 'path' => $this->_config['cookie_path'], |