fix merge conflict 0.7.x 0.8.x in util.php and register.php.

1 files changed, 7 insertions, 0 deletions

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 2b8b085ce..7f39235fe 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -140,6 +140,13 @@ class XmppConfirmHandler extends XmppQueueHandler
     }
 }
 
+// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
+// lots of CPU trying to connect to unconfigured servers
+if (common_config('xmpp','enabled')==false) {
+    print "Aborting daemon - xmpp is disabled\n";
+    exit();
+}
+
 ini_set("max_execution_time", "0");
 ini_set("max_input_time", "0");
 set_time_limit(0);