Merge branch 'master' into 0.9.x

3 files changed, 21 insertions, 10 deletions

diff --git a/lib/common.php b/lib/common.php
index 243ac3e79..ada48b339 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.0rc3');
+define('STATUSNET_VERSION', '0.9.0beta3');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Stand');
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index b98e57a1f..291174d3c 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -149,11 +149,13 @@ abstract class QueueManager extends IoManager
     function initialize()
     {
         if (Event::handle('StartInitializeQueueManager', array($this))) {
-            $this->connect('plugin', 'PluginQueueHandler');
-            $this->connect('omb', 'OmbQueueHandler');
-            $this->connect('ping', 'PingQueueHandler');
-            if (common_config('sms', 'enabled')) {
-                $this->connect('sms', 'SmsQueueHandler');
+            if (!defined('XMPP_ONLY_FLAG')) { // hack!
+                $this->connect('plugin', 'PluginQueueHandler');
+                $this->connect('omb', 'OmbQueueHandler');
+                $this->connect('ping', 'PingQueueHandler');
+                if (common_config('sms', 'enabled')) {
+                    $this->connect('sms', 'SmsQueueHandler');
+                }
             }
 
             // XMPP output handlers...
@@ -165,10 +167,14 @@ abstract class QueueManager extends IoManager
                 $this->connect('confirm', 'XmppConfirmHandler');
             }
 
-            // For compat with old plugins not registering their own handlers.
-            $this->connect('plugin', 'PluginQueueHandler');
+            if (!defined('XMPP_ONLY_FLAG')) { // hack!
+                // For compat with old plugins not registering their own handlers.
+                $this->connect('plugin', 'PluginQueueHandler');
+            }
+        }
+        if (!defined('XMPP_ONLY_FLAG')) { // hack!
+            Event::handle('EndInitializeQueueManager', array($this));
         }
-        Event::handle('EndInitializeQueueManager', array($this));
     }
 
     /**
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index a7d735d1c..00590fdb6 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -104,7 +104,12 @@ class StompQueueManager extends QueueManager
      */
     function getQueues()
     {
-        return array_keys($this->handlers[common_config('site', 'server')]);
+        $site = common_config('site', 'server');
+        if (empty($this->handlers[$site])) {
+            return array();
+        } else {
+            return array_keys($this->handlers[$site]);
+        }
     }
 
     /**