queue daemon fixes: path fix for xmpp, suppress warning in memcached init

diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 9662e97d15fe9eabd57a935c6a92c52f9d1b5f1f..0839cda57aefb2eea18c9f0c2f5c52aebb279bc9 100644 (file)
--- 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 fbc2802f78f984d1bc3acd79c29f566f9920f578..bc7fd907655d7279f72677eb4309e3b631d29a0c 100644 (file)
--- 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;
                     }