X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=573cf17c8a1a4f238c5cfdf77b96e51f729f613d;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=4d498b674679608cc33e599d0afb9bfbdce0985c;hpb=d6cf791677e3c676108f84e64818ba2a272f6d08;p=friendica.git

diff --git a/mod/smilies.php b/mod/smilies.php
index 4d498b6746..573cf17c8a 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,7 +1,21 @@
 <?php
 
-if(! function_exists('smilies_content')) {
+/**
+ * @file mod/smilies.php
+ */
+
+require_once("include/Smilies.php");
+
 function smilies_content(&$a) {
-  return smilies('',true);
-}
+	if ($a->argv[1]==="json"){
+		$tmp = Smilies::get_list();
+		$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::replace('',true);
+	}
 }