diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-30 17:11:16 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-30 17:11:16 -0700 |
| commit | d5a40cac25e1bcc936a4010ec0038f8e5143c0a0 (patch) | |
| tree | b071675ce7137dd5fc74b4ee47776dad68424796 /include/conversation.php | |
| parent | df41ce9536ad72cdc2d1edb1983a48519223da77 (diff) | |
| parent | 1097cd25830bc11d9aacf24f0e43322d6f397ca3 (diff) | |
| download | volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.tar.gz volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.tar.bz2 volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
include/items.php
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 d14d7ba84..645994035 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -588,7 +588,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; } |