Merge branch 'testing'

Conflicts:
	theme/base/css/display.css

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;
     }