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:05:38 +0100
commit1c8a6fdbe7e07aba97a4a604053446421f2eed42 (patch)
treed5f9ae6043e029df1e57582b0ea061cc1e9a5ad0 /system
parentb32dd76567c8ff09dfae59f2bd177ed8af470e23 (diff)
parent12798c426d6232eb4ad2930af4d58d18692d077f (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