diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-20 21:05:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-20 21:05:01 -0400 |
| commit | b96eb1c8230ae2f5986d6f22934c606bbca9728e (patch) | |
| tree | fecd2279927b61da28801094dc7d6b1cfa8d98fe /mod/smilies.php | |
| parent | 7594796ee11c0b245d02d145868a13ac3d84ebfc (diff) | |
| parent | 635580091a227529cb491e6441a5acbfff3177be (diff) | |
| download | volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.tar.gz volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.tar.bz2 volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.zip | |
Merge branch 'dev' into toggle-context-help
Diffstat (limited to 'mod/smilies.php')
| -rw-r--r-- | mod/smilies.php | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mod/smilies.php b/mod/smilies.php deleted file mode 100644 index 2ccc007b4..000000000 --- a/mod/smilies.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php - -function smilies_content(&$a) { - 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); - } -} |