diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-02 10:14:04 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-02 10:14:04 +0200 |
commit | a9572fa67e4778f7d0a42898c603fddcb64660f8 (patch) | |
tree | 48a7785021377dd3e7f8fcd3ff41f3cf650c327b /system/libraries/Cache | |
parent | 2efd029d012fedd421540d14b8a5759032c0b5c6 (diff) | |
parent | d3891f4f50e3cb3cfd1b6491088d759d586e2302 (diff) |
Merge upstream branch
Diffstat (limited to 'system/libraries/Cache')
-rw-r--r-- | system/libraries/Cache/drivers/Cache_memcached.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php index 1028c8fd5..4cd5f3d6f 100644 --- a/system/libraries/Cache/drivers/Cache_memcached.php +++ b/system/libraries/Cache/drivers/Cache_memcached.php @@ -189,17 +189,17 @@ class CI_Cache_memcached extends CI_Driver { { if ( ! array_key_exists('hostname', $cache_server)) { - $cache_server['hostname'] = $this->_default_options['default_host']; + $cache_server['hostname'] = $this->_memcache_conf['default']['default_host']; } if ( ! array_key_exists('port', $cache_server)) { - $cache_server['port'] = $this->_default_options['default_port']; + $cache_server['port'] = $this->_memcache_conf['default']['default_port']; } if ( ! array_key_exists('weight', $cache_server)) { - $cache_server['weight'] = $this->_default_options['default_weight']; + $cache_server['weight'] = $this->_memcache_conf['default']['default_weight']; } if (get_class($this->_memcached) == 'Memcache') |