aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-11 21:51:57 -0700
committerzotlabs <mike@macgirvin.com>2018-04-11 21:51:57 -0700
commit739a6128247d55cdab9a6432e28f5710310951b3 (patch)
treec39eb15cb8ee99c658f98ceba3f0c38288c605bb
parent953a2fd9b2db0c0f0b1cf54c766a1e39002eaea8 (diff)
downloadvolse-hubzilla-739a6128247d55cdab9a6432e28f5710310951b3.tar.gz
volse-hubzilla-739a6128247d55cdab9a6432e28f5710310951b3.tar.bz2
volse-hubzilla-739a6128247d55cdab9a6432e28f5710310951b3.zip
poll responses: start treating them as hidden activities now so that when this feature gets finished it will work flawlessly for versions greater than today.
-rwxr-xr-xboot.php1
-rw-r--r--include/conversation.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index b5de3a544..33302a71c 100755
--- a/boot.php
+++ b/boot.php
@@ -481,6 +481,7 @@ define ( 'ACTIVITY_ABSTAIN', NAMESPACE_ZOT . '/activity/abstain' );
define ( 'ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes' );
define ( 'ACTIVITY_ATTENDNO', NAMESPACE_ZOT . '/activity/attendno' );
define ( 'ACTIVITY_ATTENDMAYBE', NAMESPACE_ZOT . '/activity/attendmaybe' );
+define ( 'ACTIVITY_POLLRESPONSE', NAMESPACE_ZOT . '/activity/pollresponse' );
define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_ZOT . '/activity/heart' );
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;