diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-06-08 11:47:17 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-06-08 11:47:17 +0200 |
| commit | 5ccf5ce0189669f003a578de88936209c7b331fd (patch) | |
| tree | 99141870023df149552c11cf403b228f33610895 /system/libraries/Cache | |
| parent | 94c6b1f1c02466178c1f8e144542d753f27dd3d8 (diff) | |
Fixed according to feedback.
Diffstat (limited to 'system/libraries/Cache')
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_redis.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php index 8c650ff43..205f17cd1 100644 --- a/system/libraries/Cache/drivers/Cache_redis.php +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -47,7 +47,7 @@ class CI_Cache_redis extends CI_Driver */ protected static $_default_config = array( 'host' => '127.0.0.1', - 'password' => null, + 'password' => NULL, 'port' => 6379, 'timeout' => 0 ); @@ -185,13 +185,13 @@ class CI_Cache_redis extends CI_Driver * @return void * @see Redis::connect() */ - private function _setup_redis() + protected function _setup_redis() { $config = array(); $CI =& get_instance(); if ($CI->config->load('redis', TRUE, TRUE)) - { + { $config += $CI->config->item('redis'); } @@ -208,7 +208,8 @@ class CI_Cache_redis extends CI_Driver show_error('Redis connection refused. ' . $e->getMessage()); } - if (isset($config['password'])) { + if (isset($config['password'])) + { $this->_redis->auth($config['password']); } } |