diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
| commit | 08a9553ccc0fd883a77fbf36be5941ba119deda1 (patch) | |
| tree | d9ec5063c463f135c51d34fa2963a69965a8aad2 /include/text.php | |
| parent | 0a3fbdd128dd3b80868c93cb93901b501edf576c (diff) | |
| parent | dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 (diff) | |
| download | volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.gz volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.bz2 volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 72db9c5ea..1bc19da34 100644 --- a/include/text.php +++ b/include/text.php @@ -1115,8 +1115,8 @@ function list_smilies() { ':coffee', ':facepalm', ':like', - ':dislike' - + ':dislike', + ':hubzilla' ); $icons = array( @@ -1152,9 +1152,24 @@ function list_smilies() { '<img class="smiley" src="' . z_root() . '/images/smiley-facepalm.gif" alt=":facepalm" />', '<img class="smiley" src="' . z_root() . '/images/like.gif" alt=":like" />', '<img class="smiley" src="' . z_root() . '/images/dislike.gif" alt=":dislike" />', + '<img class="smiley" src="' . z_root() . '/images/hz-16.png" alt=":hubzilla" />', ); + $x = get_config('feature','emoji'); + if($x === false) + $x = 1; + if($x) { + if(! App::$emojitab) + App::$emojitab = json_decode(file_get_contents('library/emoji.json'),true); + foreach(App::$emojitab as $e) { + if(strpos($e['shortname'],':tone') === 0) + continue; + $texts[] = $e['shortname']; + $icons[] = '<img class="smiley emoji" height="16" width="16" src="images/emoji/' . $e['unicode'] . '.png' . '" alt="' . $e['name'] . '" />'; + } + } + $params = array('texts' => $texts, 'icons' => $icons); call_hooks('smilie', $params); |