Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index dd7535592f5e1fd46942f778b5d017ff86f4534e..8ccb19cedc187842e156d4efb919af46ead5cfae 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,4 +1,7 @@
 <?php
+
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
@@ -27,8 +30,7 @@ function delivery_run(&$argv, &$argc){
        require_once('include/bbcode.php');
        require_once('include/email.php');
 
-       load_config('config');
-       load_config('system');
+       Config::load();
 
        load_hooks();
 
@@ -396,7 +398,7 @@ function delivery_run(&$argv, &$argc){
 
                                logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
 
-                               if ($deliver_status == (-1)) {
+                               if ($deliver_status < 0) {
                                        logger('notifier: delivery failed: queuing message');
                                        add_to_queue($contact['id'],NETWORK_DFRN,$atom);