Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 8823834c1d361ed1535afa6ae92d5b52708c07cc..d78db4055d9779155b3f9ca0e6eef1a78ebde574 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -558,7 +558,7 @@ function notifier_run(&$argv, &$argc){
        if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
                if(!get_config('system','dfrn_only')) {
                        foreach($url_recipients as $url) {
-                               if($url) {
+                               if ($url) {
                                        logger('notifier: urldelivery: ' . $url);
                                        $deliver_status = slapper($owner,$url,$slap);
                                        /// @TODO Redeliver/queue these items on failure, though there is no contact record
@@ -576,7 +576,7 @@ function notifier_run(&$argv, &$argc){
                        $r0 = array();
 
                $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-                       AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+                       AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
                        dbesc(NETWORK_DIASPORA),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)