aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-05 16:32:53 -0800
committerzotlabs <mike@macgirvin.com>2017-03-05 16:32:53 -0800
commit98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa (patch)
treeea82dbbd45ecf00b6d9f4d850b04bfa77837cbae /include/text.php
parentc533c62c640cf081c44bf0489680ee3be3e45ecb (diff)
parent4c0c153b8f23a2e6cbd037591af982232cb77989 (diff)
downloadvolse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.tar.gz
volse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.tar.bz2
volse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.zip
Merge branch 'dev' into red
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/text.php b/include/text.php
index c68bd3591..9d76f9d78 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1224,20 +1224,6 @@ function list_smilies() {
);
- $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);