diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-11-29 14:30:30 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-11-29 14:30:30 +0100 |
| commit | 6276926c6dcdf976a5f4de34d62f501852e2f84b (patch) | |
| tree | a1d048d19d085e8f66e09d73d8441dd05a6a0371 /system/libraries/Session/drivers/Session_database_driver.php | |
| parent | 45023e555e762baf22b94b0e9ca353548205efb4 (diff) | |
Fix #4923
Diffstat (limited to 'system/libraries/Session/drivers/Session_database_driver.php')
| -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 6a7282b23..2f5241256 100644 --- a/system/libraries/Session/drivers/Session_database_driver.php +++ b/system/libraries/Session/drivers/Session_database_driver.php @@ -208,8 +208,12 @@ 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? - if ($session_id !== $this->_session_id) + elseif ($session_id !== $this->_session_id) { if ( ! $this->_release_lock() OR ! $this->_get_lock($session_id)) { @@ -219,10 +223,6 @@ 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) { |