summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/iomaster.php2
-rw-r--r--lib/queuemanager.php2
-rw-r--r--lib/xmppmanager.php6
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/iomaster.php b/lib/iomaster.php
index 5d1071a39..ce77b53b2 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -70,7 +70,7 @@ class IoMaster
$classes = array();
if (Event::handle('StartIoManagerClasses', array(&$classes))) {
$classes[] = 'QueueManager';
- if (common_config('xmpp', 'enabled')) {
+ if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) {
$classes[] = 'XmppManager'; // handles pings/reconnects
$classes[] = 'XmppConfirmManager'; // polls for outgoing confirmations
}
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index a98c0efff..b98e57a1f 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -157,7 +157,7 @@ abstract class QueueManager extends IoManager
}
// XMPP output handlers...
- if (common_config('xmpp', 'enabled')) {
+ if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) {
$this->connect('jabber', 'JabberQueueHandler');
$this->connect('public', 'PublicQueueHandler');
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 0839cda57..dfff63a30 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -118,7 +118,11 @@ class XmppManager extends IoManager
*/
public function getSockets()
{
- return array($this->conn->getSocket());
+ if ($this->conn) {
+ return array($this->conn->getSocket());
+ } else {
+ return array();
+ }
}
/**