diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-04-09 15:25:56 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-04-09 15:25:56 +0200 |
| commit | fd363f224d7886eb686434d7a835eaa49183d8e6 (patch) | |
| tree | 6ff4ffb408c39d08b3008cdce393671c343c43f2 /system | |
| parent | 1924eb37cc5488be7560a8a754663bba6a47a5e4 (diff) | |
| parent | b2119a785cc980cc0b22bc8535729dbad50a0913 (diff) | |
Merge pull request #3753 from ftwbzhao/feature/ci/3.0
[ci skip] Fix Cache/Redis get_metadata() for non-existing properties
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_redis.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php index a35fbf6d2..114c32983 100644 --- a/system/libraries/Cache/drivers/Cache_redis.php +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -223,7 +223,7 @@ class CI_Cache_redis extends CI_Driver { $value = $this->get($key); - if ($value) + if ($value !== FALSE) { return array( 'expire' => time() + $this->_redis->ttl($key), @@ -270,7 +270,7 @@ class CI_Cache_redis extends CI_Driver if ($CI->config->load('redis', TRUE, TRUE)) { - $config += $CI->config->item('redis'); + $config = $CI->config->item('redis'); } $config = array_merge(self::$_default_config, $config); |