diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-14 09:42:43 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-14 09:42:43 +0200 |
| commit | 5c458e9111d8853891a0545d63fe7f55ee0f5a41 (patch) | |
| tree | 01f80be918dd76a58cc1102166c53048631aed8a /include/conversation.php | |
| parent | b6d425838f9025d8faf6dbfe90fce091d94b3cd7 (diff) | |
| parent | 0ef2622621867fa197988974b47eff85f20a80e7 (diff) | |
| download | volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.gz volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.bz2 volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index bf29048b6..d2d4ffca0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -403,9 +403,12 @@ function count_descendants($item) { * @return boolean */ function visible_activity($item) { - $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); + $hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ]; - $post_types = array(ACTIVITY_OBJ_NOTE,ACTIVITY_OBJ_COMMENT,basename(ACTIVITY_OBJ_NOTE),basename(ACTIVITY_OBJ_COMMENT)); + $post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)]; + + if(intval($item['item_notshown'])) + return false; foreach ($hidden_activities as $act) { if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) { |