Merge in Phergie changes

[quix0rs-gnu-social.git] / lib / implugin.php

diff --git a/lib/implugin.php b/lib/implugin.php
index 7125aaee8d8c19ab8489c719d42328e757c886b2..dafb8a416b23da46da4fb4a2c6ee8bab5ff80302 100644 (file)
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -619,8 +619,13 @@ abstract class ImPlugin extends Plugin
 
     function initialize()
     {
+        if( ! common_config('queue', 'enabled'))
+        {
+            throw new ServerException("Queueing must be enabled to use IM plugins");
+        }
+
         if(is_null($this->transport)){
-            throw new Exception('transport cannot be null');
+            throw new ServerException('transport cannot be null');
         }
     }
 }