summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-14 14:07:24 -0800
committerBrion Vibber <brion@pobox.com>2010-01-14 14:14:22 -0800
commit532a174fc0cbc1e2cecce8a5d732e21ef41c312e (patch)
treef86b4493efa914d0eedac4e64601544bc26fb4ce
parent7211896b2f64707ac2755d81bb774fba823552c4 (diff)
Clean up host/port separation in memcached plugin -- use : not ; as separator and clean up some warnings
-rw-r--r--plugins/MemcachePlugin.php20
1 files changed, 9 insertions, 11 deletions
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index bc7fd9076..5214ab9c8 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);
}