diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-13 22:09:22 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-13 22:09:22 -0700 |
| commit | 0ef2622621867fa197988974b47eff85f20a80e7 (patch) | |
| tree | 671f4e55a9094f80b4d492b953e13fcdc3f9399e /include/conversation.php | |
| parent | 1ff9abe1b4b5570c790ed6956f4e5eda58587379 (diff) | |
| download | volse-hubzilla-0ef2622621867fa197988974b47eff85f20a80e7.tar.gz volse-hubzilla-0ef2622621867fa197988974b47eff85f20a80e7.tar.bz2 volse-hubzilla-0ef2622621867fa197988974b47eff85f20a80e7.zip | |
some work to provide propagation and honouring of the item_notshown flag.
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'])) { |