diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-09-16 09:18:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-09-16 09:18:16 +0200 |
| commit | d069b9bc148f739733a5aa0a737e51e57c10b3ad (patch) | |
| tree | 2eac25e4c7cebd0dc226ec1db990906b76aa6723 /system | |
| parent | c9efaced2fd453bf4c2fcefd31ee1a9afdf8ff16 (diff) | |
feature/session (#3073): Bug fixes
- CI_Session_database_driver::read() didn't pass the session ID to _get_lock()
- CI_Session::unset_userdata() used a wrong key for unsetting when an array is passed to it
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Session/Session.php | 2 | ||||
| -rw-r--r-- | system/libraries/Session/drivers/Session_database_driver.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index a5c9737f7..be9f5e3c7 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -567,7 +567,7 @@ class CI_Session { { foreach ($key as $k) { - unset($_SESSION[$key]); + unset($_SESSION[$k]); } return; diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php index 032199fc1..563d1fd6a 100644 --- a/system/libraries/Session/drivers/Session_database_driver.php +++ b/system/libraries/Session/drivers/Session_database_driver.php @@ -116,7 +116,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan public function read($session_id) { - if ($this->_get_lock() !== FALSE) + if ($this->_get_lock($session_id) !== FALSE) { $this->_db ->select('data') |