aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-04-12 14:46:36 +0200
committerMario Vavti <mario@mariovavti.com>2018-04-12 14:46:36 +0200
commit7c47b9d75ca02ce46175ee3bc0b54e27e8061621 (patch)
treeba7b1a6be60040f31e099e1cd30849b50a3ba1ae /include/conversation.php
parent09a8b4b379d91dd62f38c116c99187a404d7e774 (diff)
parent549f7a53b11d014993fbb550de97b6cdf45e0843 (diff)
downloadvolse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.gz
volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.bz2
volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 3834d9866..82317ae95 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -404,7 +404,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 ];
+ $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;