aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2018-04-13 10:23:30 +0200
committerGitHub <noreply@github.com>2018-04-13 10:23:30 +0200
commitdb586e0c2747a5c222c6ab394c53245aeba60c8b (patch)
tree20aca8e4b419bf4d970e2e1185388989a2597a9c /include/conversation.php
parentea36ebd0df3d7612e5a524b7a287f9c57b8783b3 (diff)
parent4aaea422bc78b351f055df66b1491e476bf65e12 (diff)
downloadvolse-hubzilla-db586e0c2747a5c222c6ab394c53245aeba60c8b.tar.gz
volse-hubzilla-db586e0c2747a5c222c6ab394c53245aeba60c8b.tar.bz2
volse-hubzilla-db586e0c2747a5c222c6ab394c53245aeba60c8b.zip
Merge pull request #6 from redmatrix/dev
Dev
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 3834d9866..4aa097d07 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;
@@ -1039,7 +1039,7 @@ function thread_author_menu($item, $mode = '') {
if($posts_link) {
$menu[] = [
'menu' => 'view_posts',
- 'title' => t('Activity/Posts'),
+ 'title' => t('Recent Activity'),
'icon' => 'fw',
'action' => '',
'href' => $posts_link