diff options
Diffstat (limited to 'include/connections.php')
| -rw-r--r-- | include/connections.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/connections.php b/include/connections.php index efc531171..f0ea8583b 100644 --- a/include/connections.php +++ b/include/connections.php @@ -86,7 +86,7 @@ function deliverable_abook_xchans($channel_id, $filter = [], $flatten = true) { $r = q("SELECT abook_xchan, xchan_network FROM abook LEFT JOIN xchan ON abook_xchan = xchan_hash WHERE abook_channel = %d $filter_sql AND abook_self = 0 - AND abook_pending = 0 + AND abook_blocked = 0 AND abook_archived = 0 AND abook_not_here = 0 AND xchan_network NOT IN ('anon', 'token', 'rss')", @@ -342,7 +342,7 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { if($r) { foreach($r as $rr) { - drop_item($rr['id'],false); + drop_item($rr['id']); } } @@ -513,7 +513,7 @@ function remove_abook_items($channel_id, $xchan_hash) { continue; } - drop_item($rr['id'],false); + drop_item($rr['id'], uid: $channel_id); } } |