summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-13 21:24:02 -0800
committerBrion Vibber <brion@pobox.com>2010-01-13 21:24:36 -0800
commitb25deaacea75f2e565a58ea14aca19627f5cfa93 (patch)
tree6174d0ae7e39df787015ae3ebdffb1a784d8ad95
parent35a2f8de4d46c403d6ca17695a8d040f003125c8 (diff)
queue daemon fixes: path fix for xmpp, suppress warning in memcached init
-rw-r--r--lib/xmppmanager.php2
-rw-r--r--plugins/MemcachePlugin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 9662e97d1..0839cda57 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -81,7 +81,7 @@ class XmppManager extends IoManager
parent::start($master);
$this->switchSite();
- require_once "lib/jabber.php";
+ require_once INSTALLDIR . "/lib/jabber.php";
# Low priority; we don't want to receive messages
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index fbc2802f7..bc7fd9076 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -166,7 +166,7 @@ class MemcachePlugin extends Plugin
if (is_array($this->servers)) {
foreach ($this->servers as $server) {
- list($host, $port) = explode(';', $server);
+ list($host, $port) = @explode(';', $server);
if (empty($port)) {
$port = 11211;
}