summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-01 12:09:41 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-07-01 12:09:41 -0400
commit557418bc1e4e9d8a06025910ad7be5f60557f71e (patch)
tree7ce91c116fe2e73230f6c43a5678ac5f7b07ab22
parent887d35cfc8c1d42e5af67d0161b244545cda464a (diff)
better transport choices when xmpp is disabled
-rw-r--r--lib/util.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index b1b4faa7e..656374516 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -869,17 +869,25 @@ function common_broadcast_notice($notice, $remote=false)
function common_enqueue_notice($notice)
{
static $localTransports = array('omb',
- 'public',
'twitter',
'facebook',
'ping');
- static $allTransports = array('sms', 'jabber');
+ static $allTransports = array('sms');
$transports = $allTransports;
+ $xmpp = common_config('xmpp', 'enabled');
+
+ if ($xmpp) {
+ $transports[] = 'jabber';
+ }
+
if ($notice->is_local == NOTICE_LOCAL_PUBLIC ||
$notice->is_local == NOTICE_LOCAL_NONPUBLIC) {
$transports = array_merge($transports, $localTransports);
+ if ($xmpp) {
+ $transports[] = 'public';
+ }
}
$qm = QueueManager::get();