diff options
| author | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
|---|---|---|
| committer | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
| commit | b587698dd45396b91106bd7c894a79747b1fb7a9 (patch) | |
| tree | 76a1d614976dd0b695e513a40f9235e3b9f7f82c /system/libraries/Cache | |
| parent | 9b9a06c9635cd3b4fce0aebe4d2eead4809999a5 (diff) | |
| parent | fd363f224d7886eb686434d7a835eaa49183d8e6 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Cache')
| -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 d97643632..b940b76cb 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); |