summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-01-14 17:14:41 -0800
committerBrion Vibber <brion@status.net>2010-01-14 17:14:41 -0800
commit038287c1ffb71207f8028014f20005483364956d (patch)
treea9e6fab83ca57d1d1ac76d0009c41cba99fa7337
parent58bc33850ab615f21b4364aac8b8b7f74a95111d (diff)
fix for --skip-xmpp hack -- forgot to do it on the ping & confirm handlers
-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
}