Merge pull request #3123 from tobiasd/20170128-nodbpwd

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index a56f1f89f07dc8873dacfe394ccf06c90498b57f..24830a11ab336f20194ab96aa4580f65b8fd9ca3 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.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');
@@ -59,8 +62,8 @@ function notifier_run(&$argv, &$argc){
        require_once('include/items.php');
        require_once('include/bbcode.php');
        require_once('include/email.php');
-       load_config('config');
-       load_config('system');
+
+       Config::load();
 
        load_hooks();
 
@@ -192,8 +195,9 @@ function notifier_run(&$argv, &$argc){
                // avoid race condition with deleting entries
 
                if ($items[0]['deleted']) {
-                       foreach ($items as $item)
+                       foreach ($items as $item) {
                                $item['deleted'] = 1;
+                       }
                }
 
                if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
@@ -326,9 +330,11 @@ function notifier_run(&$argv, &$argc){
                                                intval($uid),
                                                dbesc(NETWORK_DFRN)
                                        );
-                                       if (dbm::is_result($r))
-                                               foreach ($r as $rr)
+                                       if (dbm::is_result($r)) {
+                                               foreach ($r as $rr) {
                                                        $recipients_followup[] = $rr['id'];
+                                               }
+                                       }
                                }
                        }
                        logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);