summaryrefslogtreecommitdiff
path: root/lib/iomaster.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-16 07:48:59 -0800
committerEvan Prodromou <evan@status.net>2010-01-16 07:48:59 -0800
commit21c3e08804b312aaea21ae6bd0a0691304d6e4cd (patch)
tree9a950feabe17cd52e241eddf06d61409a190bba6 /lib/iomaster.php
parentd6b8b13116b9a2de5d745487277551b281796975 (diff)
parent598072468c9fdb07df2cda9da207f123b14566ae (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/iomaster.php')
-rw-r--r--lib/iomaster.php2
1 files changed, 1 insertions, 1 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
}