From 532a174fc0cbc1e2cecce8a5d732e21ef41c312e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 14 Jan 2010 14:07:24 -0800 Subject: [PATCH] Clean up host/port separation in memcached plugin -- use : not ; as separator and clean up some warnings --- plugins/MemcachePlugin.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php index bc7fd90765..5214ab9c89 100644 --- a/plugins/MemcachePlugin.php +++ b/plugins/MemcachePlugin.php @@ -165,20 +165,18 @@ class MemcachePlugin extends Plugin $this->_conn = new Memcache(); if (is_array($this->servers)) { - foreach ($this->servers as $server) { - list($host, $port) = @explode(';', $server); - if (empty($port)) { - $port = 11211; - } - - $this->_conn->addServer($host, $port, $this->persistent); - } + $servers = $this->servers; } else { - $this->_conn->addServer($this->servers, $this->persistent); - list($host, $port) = explode(';', $this->servers); - if (empty($port)) { + $servers = array($this->servers); + } + foreach ($servers as $server) { + if (strpos($server, ':') !== false) { + list($host, $port) = explode(':', $server); + } else { + $host = $server; $port = 11211; } + $this->_conn->addServer($host, $port, $this->persistent); } -- 2.39.5