harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti
2018-06-02 22:39:36 +02:00
parent a0e4f7ddb1 5f612521da
commit 3a9f149c80
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/connections.php
View File

@@ -374,14 +374,19 @@ function contact_remove($channel_id, $abook_id) {
return false;
$r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d",
$r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0",
dbesc($abook['abook_xchan']),
dbesc($abook['abook_xchan']),
intval($channel_id)
);
if($r) {
$r = fetch_post_tags($r,true);
foreach($r as $rr) {
drop_item($rr['id'],false);
$terms = get_terms_oftype($item['term'],TERM_FILE);
if(! $terms) {
drop_item($rr['id'],false);
}
}
}