From 54a9fb1774a256a0f61bc7a8a9ffdcee83b9895b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Mar 2015 12:22:22 -0700 Subject: diaspora's spammy permission model seems to have leaked through our firehose. Don't let it. --- include/zot.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/zot.php') diff --git a/include/zot.php b/include/zot.php index c9019ca7a..c3325609b 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1547,8 +1547,11 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque $channel = $r[0]; - // allow public postings to the sys channel regardless of permissions - if(($channel['channel_pageflags'] & PAGE_SYSTEM) && (! $arr['item_private'])) { + // allow public postings to the sys channel regardless of permissions, but not + // for comments travelling upstream. Wait and catch them on the way down. + // They may have been blocked by the owner. + + if(($channel['channel_pageflags'] & PAGE_SYSTEM) && (! $arr['item_private']) && (! $relay)) { $local_public = true; $r = q("select xchan_flags from xchan where xchan_hash = '%s' limit 1", -- cgit v1.2.3