diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
| commit | 42550321ffd40328efa8b3bd8ec627ae219cf005 (patch) | |
| tree | 7556abe8a8d6416b34541e01d098f21959e34b4c /lib/iomaster.php | |
| parent | 23a8645a394e2e27997638d03801aab380b84420 (diff) | |
| parent | 1ef8efe4c5624e7df38ce66187719038594cd828 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/iomaster.php')
| -rw-r--r-- | lib/iomaster.php | 2 |
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 } |