Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / getvaliddaemons.php

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 80c21bce581c3c0dcb65cc60b52f0985e4ef329c..f7aa0f60f88088cf06857042cf424b3650263ccc 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -33,13 +33,16 @@ by the startdaemons script
 
 ENDOFHELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+// No unnecessary error reporting to avoid invalid daemon names
+error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
 
-$daemons = array();
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
-$daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
+$daemons = array();
 
-$daemons[] = INSTALLDIR.'/scripts/imdaemon.php';
+if (common_config('queue', 'daemon')) {
+    $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
+}
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {
     foreach ($daemons as $daemon) {