diff options
| author | zotlabs <mike@macgirvin.com> | 2020-01-30 15:56:33 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-01-30 15:56:33 -0800 |
| commit | 989443a5698adf5e7a93f874048699526aa103a7 (patch) | |
| tree | f5db527455879b0d39b63a4356c25bb260858a1a /include/conversation.php | |
| parent | e9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5 (diff) | |
| download | volse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.tar.gz volse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.tar.bz2 volse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.zip | |
basic poll support and patch to not call System::get_platform_name() within t() unless needed. Polls probably need refining and have not yet been fully tested after porting
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; |