diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-11 20:44:42 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-01-11 20:44:42 +0100 |
| commit | 0bd6fa99968dd448b145146142425193a932a236 (patch) | |
| tree | f8182d6918a36a33fb36fc199dc030527575921b /system/libraries/Session | |
| parent | 167c295813c9e5dc6c412bad8c9375dae89005ce (diff) | |
| parent | 37226c036a52ae857b13109774b1cdfc4b1d4db9 (diff) | |
Merge branch 'feature/sess_db_destroy' into 3.1-stable
Diffstat (limited to 'system/libraries/Session')
| -rw-r--r-- | system/libraries/Session/drivers/Session_database_driver.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php index 31f5a4663..b519b782f 100644 --- a/system/libraries/Session/drivers/Session_database_driver.php +++ b/system/libraries/Session/drivers/Session_database_driver.php @@ -208,12 +208,8 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan // Prevent previous QB calls from messing with our queries $this->_db->reset_query(); - if ($this->_lock === FALSE) - { - return $this->_fail(); - } // Was the ID regenerated? - elseif ($session_id !== $this->_session_id) + if (isset($this->_session_id) && $session_id !== $this->_session_id) { if ( ! $this->_release_lock() OR ! $this->_get_lock($session_id)) { @@ -223,6 +219,10 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan $this->_row_exists = FALSE; $this->_session_id = $session_id; } + elseif ($this->_lock === FALSE) + { + return $this->_fail(); + } if ($this->_row_exists === FALSE) { |