diff options
author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
commit | c4bd43432df03e4f4835c7689c8ed722cd2c3020 (patch) | |
tree | 5603166833d78b0581bbe880adb53b6de085719d /system/libraries/Session/drivers/Session_memcached_driver.php | |
parent | 488ad40ba334ca506f07bede97724726eac2b27f (diff) | |
parent | 9180a1264dc536c34e5cc8a0e44bb399a8ba484f (diff) |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/libraries/Session/drivers/Session_memcached_driver.php')
-rw-r--r-- | system/libraries/Session/drivers/Session_memcached_driver.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php index 88eb4b3a6..99b4d1baa 100644 --- a/system/libraries/Session/drivers/Session_memcached_driver.php +++ b/system/libraries/Session/drivers/Session_memcached_driver.php @@ -209,10 +209,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa $this->_memcached->replace($this->_lock_key, time(), 300); if ($this->_fingerprint !== ($fingerprint = md5($session_data))) { - if ( - $this->_memcached->replace($key, $session_data, $this->_config['expiration']) - OR ($this->_memcached->getResultCode() === Memcached::RES_NOTFOUND && $this->_memcached->set($key, $session_data, $this->_config['expiration'])) - ) + if ($this->_memcached->set($key, $session_data, $this->_config['expiration'])) { $this->_fingerprint = $fingerprint; return $this->_success; @@ -220,8 +217,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa return $this->_fail(); } - - if ( + elseif ( $this->_memcached->touch($key, $this->_config['expiration']) OR ($this->_memcached->getResultCode() === Memcached::RES_NOTFOUND && $this->_memcached->set($key, $session_data, $this->_config['expiration'])) ) |