summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-01 10:30:45 -0800
committerBrion Vibber <brion@pobox.com>2010-02-01 10:30:45 -0800
commitc14ac57b1935a124dd4205e0f02d939086b5867e (patch)
tree207e1c947eec0eadac98ba0050d84056e450d99e /lib
parent85544d369d2c9c3ba0fef6c821c951879823b014 (diff)
parentfba4153346435026976193a7d38e6042b863733d (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index ed1a62385..9e8ac26ad 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -989,9 +989,14 @@ function common_enqueue_notice($notice)
static $localTransports = array('omb',
'ping');
- static $allTransports = array('sms', 'plugin');
-
- $transports = $allTransports;
+ $transports = array();
+ if (common_config('sms', 'enabled')) {
+ $transports[] = 'sms';
+ }
+ if (Event::hasHandler('HandleQueuedNotice')) {
+ $transports[] = 'plugin';
+ }
+
$xmpp = common_config('xmpp', 'enabled');
@@ -999,6 +1004,7 @@ function common_enqueue_notice($notice)
$transports[] = 'jabber';
}
+ // @fixme move these checks into QueueManager and/or individual handlers
if ($notice->is_local == Notice::LOCAL_PUBLIC ||
$notice->is_local == Notice::LOCAL_NONPUBLIC) {
$transports = array_merge($transports, $localTransports);