aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-30 12:34:00 -0700
committerzotlabs <mike@macgirvin.com>2016-10-30 12:34:00 -0700
commit581ef6e18d65804daf40d2c516b031801662eacd (patch)
tree7d28393f599bc6503b17bf2decd0abf3e6997139 /Zotlabs
parent321a32050b0bbf1478e4152fa1479d6486230721 (diff)
downloadvolse-hubzilla-581ef6e18d65804daf40d2c516b031801662eacd.tar.gz
volse-hubzilla-581ef6e18d65804daf40d2c516b031801662eacd.tar.bz2
volse-hubzilla-581ef6e18d65804daf40d2c516b031801662eacd.zip
string update
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Connedit.php16
1 files changed, 7 insertions, 9 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index cee593a5f..5ab6f814b 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -521,11 +521,12 @@ class Connedit extends \Zotlabs\Web\Controller {
if($cmd === 'drop') {
- // FIXME
- // We need to send either a purge or a refresh packet to the other side (the channel being unfriended).
- // The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier runs
- // in the background there could be a race condition preventing this packet from being sent in all cases.
- // PLACEHOLDER
+ // @FIXME
+ // We need to send either a purge or a refresh packet to the other side (the channel being unfriended).
+ // The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier
+ // runs in the background there could be a race condition preventing this packet from being sent in all
+ // cases.
+ // PLACEHOLDER
contact_remove(local_channel(), $orig_record[0]['abook_id']);
build_sync_packet(0 /* use the current local_channel */,
@@ -800,9 +801,6 @@ class Connedit extends \Zotlabs\Web\Controller {
return $arr['output'];
- }
-
-
+ }
}
-
}