GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't enqueue into plugin or SMS queues when disabled (breaks unqueuehandler if SMS queue isn't attached)

This commit is contained in:
Brion Vibber 2010-02-01 10:16:19 -08:00
parent 1625a13b93
commit fba4153346
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util.php
View File

@ -996,9 +996,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');
@ -1006,6 +1011,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);