summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-18 23:26:03 -0500
committerEvan Prodromou <evan@status.net>2010-01-18 23:26:03 -0500
commit42a47a771954c11525cda1c93ec55f53b8d33c93 (patch)
tree70e30e9e7287efbd6f16745df7f3fa7638338e69 /plugins
parent71f519f64aed1dd6823a0f09db5c4c2e409da778 (diff)
parent775c63b654dacf733e7bef99cb9f6f07aa824854 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins')
-rw-r--r--plugins/MemcachePlugin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index 5214ab9c8..8c8b8da6d 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -170,8 +170,8 @@ class MemcachePlugin extends Plugin
$servers = array($this->servers);
}
foreach ($servers as $server) {
- if (strpos($server, ':') !== false) {
- list($host, $port) = explode(':', $server);
+ if (strpos($server, ';') !== false) {
+ list($host, $port) = explode(';', $server);
} else {
$host = $server;
$port = 11211;