More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 812752a55c2ac2975834be4154de455d3c052cc7..404280365f11a045749f4c16147e920797b44248 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -170,7 +170,7 @@ function notifier_run(&$argv, &$argc){
                        intval($item_id)
                );
 
-               if((! count($r)) || (! intval($r[0]['parent']))) {
+               if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
                        return;
                }
 
@@ -210,7 +210,7 @@ function notifier_run(&$argv, &$argc){
                intval($uid)
        );
 
-       if(! count($r))
+       if(! dbm::is_result($r))
                return;
 
        $owner = $r[0];
@@ -321,7 +321,7 @@ function notifier_run(&$argv, &$argc){
                                                intval($uid),
                                                dbesc(NETWORK_DFRN)
                                        );
-                                       if(count($r))
+                                       if(dbm::is_result($r))
                                                foreach($r as $rr)
                                                        $recipients_followup[] = $rr['id'];
                                }
@@ -445,7 +445,7 @@ function notifier_run(&$argv, &$argc){
 
                $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
 
-               if(count($r))
+               if(dbm::is_result($r))
                        $contacts = $r;
 
        } else
@@ -463,7 +463,7 @@ function notifier_run(&$argv, &$argc){
                                intval($uid),
                                dbesc(NETWORK_MAIL)
                        );
-                       if(count($r)) {
+                       if(dbm::is_result($r)) {
                                foreach($r as $rr)
                                        $recipients[] = $rr['id'];
                        }
@@ -491,7 +491,7 @@ function notifier_run(&$argv, &$argc){
 
        // delivery loop
 
-       if(count($r)) {
+       if(dbm::is_result($r)) {
 
                foreach($r as $contact) {
                        if(!$contact['self']) {
@@ -592,7 +592,7 @@ function notifier_run(&$argv, &$argc){
 
                $r = array_merge($r2,$r1,$r0);
 
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
                        // throw everything into the queue in case we get killed