diff options
| author | zotlabs <mike@macgirvin.com> | 2020-02-09 16:32:18 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-02-09 16:32:18 -0800 |
| commit | bbcb237f5b996e94af37611152105b2e965ea493 (patch) | |
| tree | 042ea69cfc8eb90f0588b9c71edb8e4ef164390b /include/conversation.php | |
| parent | fc9e6d289acf30f89da0051a90cbf16f0bc006fb (diff) | |
| download | volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.tar.gz volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.tar.bz2 volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.zip | |
poll updates
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 45b2b4d80..327d89e53 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -408,11 +408,15 @@ function count_descendants($item) { * @return boolean */ function visible_activity($item) { - $hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE, 'Answer' ]; + $hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE ]; if(intval($item['item_notshown'])) return false; + if ($item['obj_type'] === 'Answer') { + return false; + } + foreach($hidden_activities as $act) { if((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) { return false; |