summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-03-12 12:05:38 +0100
committerAndrey Andreev <narf@devilix.net>2016-03-12 12:06:22 +0100
commita0556f128417467faaa7048bb1bf8da154e79582 (patch)
tree109b7baa13c48e11a220e95791da0c9b5dc02540 /system
parent9c948aa715a539aa4dcdd1647156436700411dd1 (diff)
Merge pull request #4526 from masterklavi/redis_refactor
Remove an unnecessary assignment from Cache_redis configuration
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Cache/drivers/Cache_redis.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index a58aaef4e..d4d95ebb1 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -97,15 +97,17 @@ class CI_Cache_redis extends CI_Driver
return;
}
- $config = array();
$CI =& get_instance();
if ($CI->config->load('redis', TRUE, TRUE))
{
- $config = $CI->config->item('redis');
+ $config = array_merge(self::$_default_config, $CI->config->item('redis'));
+ }
+ else
+ {
+ $config = self::$_default_config;
}
- $config = array_merge(self::$_default_config, $config);
$this->_redis = new Redis();
try