diff options
| author | Mario <mario@mariovavti.com> | 2020-01-31 10:34:55 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-01-31 10:34:55 +0100 |
| commit | 69b25e490e5effba78fcdd9fb991fe71b7523138 (patch) | |
| tree | bed30f592e179da1a842114370bdd402cafb2495 /include/conversation.php | |
| parent | c50a311ff32d7361d0809d87b03be1b4ec25b783 (diff) | |
| parent | b8d7647c48f9683909476d14c6f94195980b15a2 (diff) | |
| download | volse-hubzilla-69b25e490e5effba78fcdd9fb991fe71b7523138.tar.gz volse-hubzilla-69b25e490e5effba78fcdd9fb991fe71b7523138.tar.bz2 volse-hubzilla-69b25e490e5effba78fcdd9fb991fe71b7523138.zip | |
Merge branch 'dev' into 'dev'
polls and other backend z6 compat work
See merge request hubzilla/core!1825
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 07d43e660..45b2b4d80 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -408,7 +408,7 @@ 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 ]; + $hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_POLLRESPONSE, 'Answer' ]; if(intval($item['item_notshown'])) return false; @@ -419,6 +419,8 @@ function visible_activity($item) { } } + + if(is_edit_activity($item)) return false; |