turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.

2016-06-03 16:04:54 -07:00
parent 624f4641e2
commit e81ac9e063
3 changed files with 3 additions and 1 deletions
--- 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,