X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=4a20497a831c70a140135058902bac9b97117601;hb=72a3ab6382551811f22391b7e82e7398628b235b;hp=c5943fc89dd9d736285752badb84354a0aaf657e;hpb=9e9429b56d85626259e89d6373e59f9307be9c78;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index c5943fc89d..4a20497a83 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -1,22 +1,27 @@ . * - * Have also a look here: - * https://www.webpagefx.com/tools/emoji-cheat-sheet/ */ + namespace Friendica\Content; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\PConfig; use Friendica\DI; use Friendica\Util\Strings; @@ -27,7 +32,7 @@ use Friendica\Util\Strings; class Smilies { /** - * @brief Replaces/adds the emoticon list + * Replaces/adds the emoticon list * * This function should be used whenever emoticons are added * @@ -50,7 +55,7 @@ class Smilies } /** - * @brief Function to list all smilies + * Function to list all smilies * * Get an array of all smilies, both internal and from addons. * @@ -180,7 +185,6 @@ class Smilies * function from being executed by the prepare_text() routine when preparing * bbcode source for HTML display * - * @brief Replaces text emoticons with graphical images * @param string $s Text that should be replaced * @param boolean $no_images Only replace emoticons without images * @@ -209,7 +213,7 @@ class Smilies */ public static function replaceFromArray($text, array $smilies, $no_images = false) { - if (intval(Config::get('system', 'no_smilies')) + if (intval(DI::config()->get('system', 'no_smilies')) || (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_smilies'))) ) { return $text; @@ -262,7 +266,7 @@ class Smilies /** - * @brief expand <3333 to the correct number of hearts + * expand <3333 to the correct number of hearts * * @param string $x string *