aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-05-02 22:34:34 -0700
committerzotlabs <mike@macgirvin.com>2019-05-02 22:34:34 -0700
commit7b4cb31a10a3ad4b9c0c671014074362fa19cb6c (patch)
tree28949266fc670563f844ac0df1cf4d07974a165b
parentf55f5fa92a60c27bc14069d8046cf26550ec5053 (diff)
downloadvolse-hubzilla-7b4cb31a10a3ad4b9c0c671014074362fa19cb6c.tar.gz
volse-hubzilla-7b4cb31a10a3ad4b9c0c671014074362fa19cb6c.tar.bz2
volse-hubzilla-7b4cb31a10a3ad4b9c0c671014074362fa19cb6c.zip
when removed items for unfriended connections, check if the parent has been retained, not just the item
-rw-r--r--include/connections.php23
1 files changed, 20 insertions, 3 deletions
diff --git a/include/connections.php b/include/connections.php
index d97ea3887..6382250d5 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -373,19 +373,36 @@ function contact_remove($channel_id, $abook_id) {
if(intval($abook['abook_self']))
return false;
- $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",
+ $r = q("select id, parent 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) {
foreach($r as $rr) {
- $x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
+ $w = $x = $y = null;
+
+ // if this isn't the parent, see if the conversation was retained
+ if($rr['id'] != $rr['parent']) {
+ $w = q("select id from item where parent = %d and item_retained = 0",
+ intval($rr['parent'])
+ );
+ if($w) {
+ // see if the conversation was filed
+ $x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
+ intval(TERM_OBJ_POST),
+ intval($w[0]['id']),
+ intval(TERM_FILE)
+ );
+ }
+ }
+ // see if this item was filed
+ $y = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
intval(TERM_OBJ_POST),
intval($rr['id']),
intval(TERM_FILE)
);
- if($x) {
+ if($w || $x || $y) {
continue;
}
drop_item($rr['id'],false);