diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-28 17:55:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-28 17:55:21 -0700 |
| commit | 03756c65fc1c5bebfc4009bca32b5f681b5c1b21 (patch) | |
| tree | 2fdd8bb81f906086fd0059943227d64517baa8cf /include/conversation.php | |
| parent | 52ccbd6b64d46aa7f2dfbf73599889efeaf66a08 (diff) | |
| download | volse-hubzilla-03756c65fc1c5bebfc4009bca32b5f681b5c1b21.tar.gz volse-hubzilla-03756c65fc1c5bebfc4009bca32b5f681b5c1b21.tar.bz2 volse-hubzilla-03756c65fc1c5bebfc4009bca32b5f681b5c1b21.zip | |
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
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |