aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-31 16:11:51 -0700
committerzotlabs <mike@macgirvin.com>2018-05-31 16:11:51 -0700
commit5d83469621facf89884ada4036bd25b7b566b616 (patch)
tree4977d5f329c1f0fe4c391b29d79d87a76e80f027
parent7e8c7f86f0d103dbffa0ee4fc7538d89a0925a15 (diff)
downloadvolse-hubzilla-5d83469621facf89884ada4036bd25b7b566b616.tar.gz
volse-hubzilla-5d83469621facf89884ada4036bd25b7b566b616.tar.bz2
volse-hubzilla-5d83469621facf89884ada4036bd25b7b566b616.zip
when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to.
-rw-r--r--include/connections.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/connections.php b/include/connections.php
index 32baa94bd..5a9e31950 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -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);
+ }
}
}