Merge remote branch 'statusnet/1.0.x' into msn-plugin

2010-06-22 20:27:18 -07:00
parent c5ad04c865 dad0b06a38
commit aa3fec73da
1 changed files with 6 additions and 1 deletions
--- 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');
        }
    }
 }