diff options
author | Brion Vibber <brion@pobox.com> | 2010-01-27 19:49:26 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-01-27 19:49:26 -0800 |
commit | 84e7c7783c3a781b6dc12335371c984eca8e43d8 (patch) | |
tree | 9f4792114661d798d2f19cfc89eed554bbc01c04 /classes | |
parent | b1402896e7dac59ab1eecae4babf83a06d2f256d (diff) | |
parent | a85a3ddc725a99ea182e86ec65f6be574752b18f (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes')
-rw-r--r-- | classes/Notice.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 0966697e2..6b364fb5c 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -326,9 +326,13 @@ class Notice extends Memcached_DataObject # XXX: someone clever could prepend instead of clearing the cache $notice->blowOnInsert(); - $qm = QueueManager::get(); - - $qm->enqueue($notice, 'distrib'); + if (common_config('queue', 'inboxes')) { + $qm = QueueManager::get(); + $qm->enqueue($notice, 'distrib'); + } else { + $handler = new DistribQueueHandler(); + $handler->handle($notice); + } return $notice; } |