Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/zot.php
This commit is contained in:
@@ -1092,9 +1092,15 @@ function zot_import($arr, $sender_url) {
|
||||
$recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
|
||||
}
|
||||
}
|
||||
stringify_array_elms($recip_arr);
|
||||
$recips = implode(',',$recip_arr);
|
||||
$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and channel_removed = 0 ");
|
||||
|
||||
$r = false;
|
||||
if($recip_arr) {
|
||||
stringify_array_elms($recip_arr);
|
||||
$recips = implode(',',$recip_arr);
|
||||
$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " )
|
||||
and channel_removed = 0 ");
|
||||
}
|
||||
|
||||
if(! $r) {
|
||||
logger('recips: no recipients on this site');
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user