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

when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to.

Browse Source
This commit is contained in:
zotlabs 2018-05-31 16:11:51 -07:00
parent 7e8c7f86f0
commit 5d83469621
1 changed files with 7 additions and 2 deletions
Show Stats 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; 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']),
dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']),
intval($channel_id) intval($channel_id)
); );
if($r) { if($r) {
$r = fetch_post_tags($r,true);
foreach($r as $rr) { foreach($r as $rr) {
drop_item($rr['id'],false); $terms = get_terms_oftype($item['term'],TERM_FILE);
if(! $terms) {
drop_item($rr['id'],false);
}
} }
} }