Merge pull request #12277 from nupplaphil/mod/fbrowser

[friendica.git] / src / Content / Smilies.php

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 04dcf99070ac234e5a95197462fa0d97ef38cbdc..02abee6cf61d9605fcd7e0a52276a66b35b3c155 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -213,7 +213,7 @@ class Smilies
        public static function replaceFromArray(string $text, array $smilies, bool $no_images = false): string
        {
                if (intval(DI::config()->get('system', 'no_smilies'))
-                       || (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_smilies')))
+                       || (DI::userSession()->getLocalUserId() && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_smilies')))
                ) {
                        return $text;
                }