bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
This commit is contained in:
Roland Häder 2016-12-20 15:44:31 +01:00
commit b9e4b9f274
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/notifier.php
View file

@ -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)