aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-03 16:04:54 -0700
committerredmatrix <git@macgirvin.com>2016-06-03 16:04:54 -0700
commite81ac9e0637c4533aeb144511b8f68ec8a99e257 (patch)
treea2be7feb55245d56e83b9b89f4c93e94d8ebd6c7 /Zotlabs/Lib
parent624f4641e2a8af91f519ac47ba1c72138734b17c (diff)
downloadvolse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.tar.gz
volse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.tar.bz2
volse-hubzilla-e81ac9e0637c4533aeb144511b8f68ec8a99e257.zip
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/ThreadItem.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 0ba0c0a13..65f00b867 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -347,6 +347,7 @@ class ThreadItem {
'has_tags' => $has_tags,
// Item toolbar buttons
+ 'emojis' => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
'like' => $like,
'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
'share' => $share,