summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorMasterklavi <masterklavi@gmail.com>2016-03-12 07:59:54 +0100
committerMasterklavi <masterklavi@gmail.com>2016-03-12 11:53:03 +0100
commitb13604287adcd1b70a624c83be67b8e2f35835c5 (patch)
tree8a187aac78e9cec26687be6e69aad0cbb30899c4 /system/libraries
parentb32dd76567c8ff09dfae59f2bd177ed8af470e23 (diff)
The "$config" variable is moved to "if" condition
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Cache/drivers/Cache_redis.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index a58aaef4e..27107b332 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -102,10 +102,13 @@ class CI_Cache_redis extends CI_Driver
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