diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-04 05:45:53 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-04 05:45:53 -0400 |
| commit | c08f428b5e7979e87250c2b0a30cd16344b395d9 (patch) | |
| tree | 4da053975141628a0ead27f5a50606e9aec4fc27 /Zotlabs/Lib | |
| parent | b93e398674b375a3b14718fc6dd2a815aad9b387 (diff) | |
| parent | 20a79c7acf1850f431f4fd52972ea0b6acf8ce0c (diff) | |
| download | volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.gz volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.bz2 volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 0ba0c0a13..e55931f40 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -14,6 +14,8 @@ class ThreadItem { private $template = 'conv_item.tpl'; private $comment_box_template = 'comment_item.tpl'; private $commentable = false; + // list of supported reaction emojis - a site can over-ride this via config system.reactions + private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f622','1f62e','1f634','1f61c','1f607','1f608']; private $toplevel = false; private $children = array(); private $parent = null; @@ -50,6 +52,14 @@ class ThreadItem { $this->add_child($child); } } + + // allow a site to configure the order and content of the reaction emoji list + if($this->toplevel) { + $x = get_config('system','reactions'); + if($x && is_array($x) && count($x)) { + $this->reactions = $x; + } + } } /** @@ -345,8 +355,9 @@ class ThreadItem { 'photo' => $body['photo'], 'event' => $body['event'], 'has_tags' => $has_tags, - + 'reactions' => $this->reactions, // 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, |