X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsmilies.php;h=a33cbf6ad5adabc4ca4e8704d278df634f6513d7;hb=8238afc70b5837df418c541bcad476d715d43ba4;hp=4d8ab6bcaa55fcdb3dbd2d1929efc01a8296fd63;hpb=f852f7aac0b44f243d3cd812aa92122f7b38067b;p=friendica.git

diff --git a/mod/smilies.php b/mod/smilies.php
index 4d8ab6bcaa..a33cbf6ad5 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -1,21 +1,25 @@
 <?php
-
 /**
  * @file mod/smilies.php
  */
+use Friendica\App;
+use Friendica\Content\Smilies;
+use Friendica\Core\System;
 
-require_once("include/Smilies.php");
-
-function smilies_content(App $a) {
-	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]);
+/**
+ * @param object $a App
+ * @return mixed
+ */
+function smilies_content(App $a)
+{
+	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]];
 		}
-		json_return_and_die($results);
-	}
-	else {
-		return Smilies::replace('',true);
+		System::jsonExit($results);
+	} else {
+		return Smilies::replace('', true);
 	}
 }