From 03756c65fc1c5bebfc4009bca32b5f681b5c1b21 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 28 Jul 2015 17:55:21 -0700 Subject: make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index fb012667e..76a2f47d1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -597,7 +597,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ if($arr_blocked) { $blocked = false; foreach($arr_blocked as $b) { - if(($b) && ($item['author_xchan'] == $b)) { + if(($b) && (($item['author_xchan'] == $b) || ($item['owner_xchan'] == $b))) { $blocked = true; break; } -- cgit v1.2.3