Fixes:

[friendica.git] / mod / smilies.php

diff --git a/mod/smilies.php b/mod/smilies.php
index a33cbf6ad5adabc4ca4e8704d278df634f6513d7..1c0a1bbd769e2415a739aa2aafe9e542a6282639 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -8,18 +8,24 @@ use Friendica\Core\System;
 
 /**
  * @param object $a App
- * @return mixed
+ * @return string
  */
 function smilies_content(App $a)
 {
+       $smilies = Smilies::getList();
        if ($a->argv[1] === "json") {
-               $tmp = Smilies::getList();
                $results = [];
-               for ($i = 0; $i < count($tmp['texts']); $i++) {
-                       $results[] = ['text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]];
+               for ($i = 0; $i < count($smilies['texts']); $i++) {
+                       $results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];
                }
                System::jsonExit($results);
        } else {
-               return Smilies::replace('', true);
+               $s = '<div class="smiley-sample">';
+               for ($x = 0; $x < count($smilies['texts']); $x ++) {
+                       $s .= '<dl><dt>' . $smilies['texts'][$x] . '</dt><dd>' . $smilies['icons'][$x] . '</dd></dl>';
+               }
+               $s .= '</div>';
+
+               return $s;
        }
 }