aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-09 00:49:55 -0800
committerzotlabs <mike@macgirvin.com>2016-12-09 00:49:55 -0800
commit0a6916e1b9ad3607840077ae568f13e1175496b3 (patch)
treeddb7aefef0a2941e80bfc0134420e4316c2a3b19 /include
parente419a034b7ce55d2e639ea2100cbafd46c109fd9 (diff)
downloadvolse-hubzilla-0a6916e1b9ad3607840077ae568f13e1175496b3.tar.gz
volse-hubzilla-0a6916e1b9ad3607840077ae568f13e1175496b3.tar.bz2
volse-hubzilla-0a6916e1b9ad3607840077ae568f13e1175496b3.zip
superblock issue + string update
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 0f61eea27..b9f390def 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -790,7 +790,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;
}
@@ -804,7 +804,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if($arr_blocked && $item['children']) {
for($d = 0; $d < count($item['children']); $d ++) {
foreach($arr_blocked as $b) {
- if(($b) && ($item['children'][$d]['author_xchan'] == $b))
+ if(($b) && (($item['children'][$d]['author_xchan'] == $b) || ($item['children'][$d]['owner_xchan'] == $b)))
$item['children'][$d]['author_blocked'] = true;
}
}