Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 9e1450ba2b5004a676f62375aab0f686290f3c23..d78db4055d9779155b3f9ca0e6eef1a78ebde574 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -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)