From 22fbb512d5be1d95cae7c59f967b978d59557a5a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 3 Oct 2018 02:42:21 +0000 Subject: do not propagate channel deletion for an already deleted channel. (cherry picked from commit 7c1e99884cf9013d68dcce174e8f8d4f9dac49f7) --- include/channel.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/channel.php b/include/channel.php index 33e438e53..6a934cb82 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2533,6 +2533,12 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { if(! $local) { + if(intval($r[0]['channel_removed'])) { + // already removed. do not propagate deletion of a channel which + // may have been removed locally at some previous time. + return; + } + $r = q("update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d", dbesc(datetime_convert()), intval($channel_id) -- cgit v1.2.3