From e0bf8ad95b2d2ddc7b988c25e9cffa20075a5d8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 1 Jul 2009 11:34:12 -0400
Subject: Add UnQueueManager for immediate handling

Perhaps it's a little precious, but I took out the switches in
util.php to determine what's supposed to be sent when, and made
a queuemanager class that will just do things when they're supposed to
be done.
---
 lib/queuemanager.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/queuemanager.php')

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 92f0e10de..6bb21de9b 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -36,9 +36,15 @@ class QueueManager
     {
         if (empty(self::$qm)) {
 
-            $type = common_config('queue', 'sub');
+            if (Event::handle('StartNewQueueManager', array(&self::$qm))) {
 
-            if (Event::handle('StartNewQueueManager', array($type, &self::$qm))) {
+                $enabled = common_config('queue', 'enabled');
+                $type = common_config('queue', 'sub');
+
+                if (!$enabled) {
+                    // does everything immediately
+                    return new UnQueueManager();
+                }
 
                 switch ($type) {
                  case 'db':
-- 
cgit v1.2.3-54-g00ecf