Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / smilies.php

diff --git a/mod/smilies.php b/mod/smilies.php
index 5ca3af14a42fae3ae7e29d15b44688354d7a05ee..b19ba2e43609bd1ab719423200d645b2afaf35e3 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -3,18 +3,23 @@
 /**
  * @file mod/smilies.php
  */
+use Friendica\App;
+use Friendica\Content\Smilies;
 
-require_once("include/Smilies.php");
-
-function smilies_content(App $a) {
-       if ($a->argv[1]==="json"){
-               $tmp = Smilies::get_list();
+/**
+ * @param object $a App
+ * @return mixed
+ */
+function smilies_content(App $a)
+{
+       if ($a->argv[1] === "json") {
+               $tmp = Smilies::getList();
                $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);
+               return Smilies::replace('', true);
        }
 }