X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=19c53d340dbb5822947806a39a38fd0af011d9b4;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=1dd40e1631bf13e5d4adf3acc379464d501f7eeb;hpb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 1dd40e1631..19c53d340d 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -1,20 +1,26 @@ . * - * 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\DI; use Friendica\Util\Strings; @@ -207,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;