X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSmilies.php;h=422f37d3e54bbb40df037546c347a954120d60a5;hb=ce3b1210640ce653ef91cbf033788474c1f88b0c;hp=df4b4e1cd0f817f0abed5d6d54a6a886395f96b7;hpb=e90876cd86895a64c8a0d8fec2e2caddc3ac5613;p=friendica.git diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php index df4b4e1cd0..422f37d3e5 100644 --- a/src/Module/Smilies.php +++ b/src/Module/Smilies.php @@ -3,6 +3,7 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Content; use Friendica\Core\Renderer; use Friendica\Core\System; @@ -11,24 +12,12 @@ use Friendica\Core\System; */ class Smilies extends BaseModule { - public static function content() - { - $smilies = \Friendica\Content\Smilies::getList(); - $count = count(defaults($smilies, 'texts', [])); - - $tpl = Renderer::getMarkupTemplate('smilies.tpl'); - return Renderer::replaceMacros($tpl, [ - '$count' => $count, - '$smilies' => $smilies, - ]); - } - public static function rawContent() { $app = self::getApp(); - $smilies = \Friendica\Content\Smilies::getList(); if (!empty($app->argv[1]) && ($app->argv[1] === "json")) { + $smilies = Content\Smilies::getList(); $results = []; for ($i = 0; $i < count($smilies['texts']); $i++) { $results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]]; @@ -36,4 +25,16 @@ class Smilies extends BaseModule System::jsonExit($results); } } + + public static function content() + { + $smilies = Content\Smilies::getList(); + $count = count(defaults($smilies, 'texts', [])); + + $tpl = Renderer::getMarkupTemplate('smilies.tpl'); + return Renderer::replaceMacros($tpl, [ + '$count' => $count, + '$smilies' => $smilies, + ]); + } }