summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorMasterklavi <masterklavi@gmail.com>2016-03-12 07:26:28 +0100
committerMasterklavi <masterklavi@gmail.com>2016-03-12 07:26:28 +0100
commit4933c16efd7bad7353877910b7d43d0b5a87735e (patch)
treeb3475b310ef3ba3078f4727eae96d8036ee73a03 /system
parent1c6a3f4356856899f012c6dc1ae81a21c35016e0 (diff)
Renamed $this->_memcache_conf to $this->_config
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Cache/drivers/Cache_memcached.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index c44958b97..09dc7b0de 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -60,7 +60,7 @@ class CI_Cache_memcached extends CI_Driver {
*
* @var array
*/
- protected $_memcache_conf = array(
+ protected $_config = array(
'default' => array(
'host' => '127.0.0.1',
'port' => 11211,
@@ -81,17 +81,17 @@ class CI_Cache_memcached extends CI_Driver {
{
// Try to load memcached server info from the config file.
$CI =& get_instance();
- $defaults = $this->_memcache_conf['default'];
+ $defaults = $this->_config['default'];
if ($CI->config->load('memcached', TRUE, TRUE))
{
if (is_array($CI->config->config['memcached']))
{
- $this->_memcache_conf = array();
+ $this->_config = array();
foreach ($CI->config->config['memcached'] as $name => $conf)
{
- $this->_memcache_conf[$name] = $conf;
+ $this->_config[$name] = $conf;
}
}
}
@@ -109,7 +109,7 @@ class CI_Cache_memcached extends CI_Driver {
log_message('error', 'Cache: Failed to create Memcache(d) object; extension not loaded?');
}
- foreach ($this->_memcache_conf as $cache_server)
+ foreach ($this->_config as $cache_server)
{
isset($cache_server['hostname']) OR $cache_server['hostname'] = $defaults['host'];
isset($cache_server['port']) OR $cache_server['port'] = $defaults['port'];