diff options
| author | Mario <mario@mariovavti.com> | 2024-03-22 08:37:29 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-03-22 08:37:29 +0000 |
| commit | 1aeb05628b6a2a069c46980efbe628362c9e3e74 (patch) | |
| tree | e9aed15d0cd74e0c23dcb05c7be8fe9541efdf36 /Zotlabs/Module/Smilies.php | |
| parent | 5b7387459cf4de8f7354d81cb0392c4225714d94 (diff) | |
| parent | b464fae3bf22585888c5f3def8eded76fd48ed16 (diff) | |
| download | volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.tar.gz volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.tar.bz2 volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.zip | |
Merge branch '9.0RC'9.0
Diffstat (limited to 'Zotlabs/Module/Smilies.php')
| -rw-r--r-- | Zotlabs/Module/Smilies.php | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Zotlabs/Module/Smilies.php b/Zotlabs/Module/Smilies.php index efac07f84..7dde8c834 100644 --- a/Zotlabs/Module/Smilies.php +++ b/Zotlabs/Module/Smilies.php @@ -4,18 +4,8 @@ namespace Zotlabs\Module; class Smilies extends \Zotlabs\Web\Controller { - function get() { - if (\App::$argv[1]==="json"){ - $tmp = list_smilies(); - $results = array(); - for($i = 0; $i < count($tmp['texts']); $i++) { - $results[] = array('text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]); - } - json_return_and_die($results); - } - else { - return smilies('',true); - } + function init() { + json_return_and_die(get_emojis()); } - + } |