X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=81f55f710190e3fc9a8499e374ccf81900d942b2;hb=f65d6531cafe625d6be011e135d132ae48fc7c06;hp=c110984dde0f9021f4d40e48809eec77446fd565;hpb=4fdaca861b5df3c72e6c5f294c2b2f3da872d996;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index c110984dde..81f55f7101 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -519,8 +519,8 @@ function notifier_run(&$argv, &$argc){ } $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` - FROM `contact` WHERE `network` = '%s' - AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", + FROM `contact` WHERE `network` = '%s' AND `batch` != '' + AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`", dbesc(NETWORK_DIASPORA), intval($owner['uid']), intval(CONTACT_IS_SHARING) @@ -528,8 +528,7 @@ function notifier_run(&$argv, &$argc){ } $r2 = q("SELECT `id`, `name`,`network` FROM `contact` - WHERE `network` in ( '%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `rel` != %d order by rand() ", + WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d", dbesc(NETWORK_DFRN), dbesc(NETWORK_MAIL2), intval($owner['uid']),