Issue-#3873

[friendica.git] / include / Smilies.php

diff --git a/include/Smilies.php b/include/Smilies.php
index a2d7637c793d779d9334cf3fe988290e27d77248..28fd59db0497ab0c2d0fdef12b1e4e4ce4f790cd 100644 (file)
--- a/include/Smilies.php
+++ b/include/Smilies.php
@@ -14,6 +14,8 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
 
 /**
@@ -156,8 +158,8 @@ class Smilies {
         * @return string HML Output of the Smilie
         */
        public static function replace($s, $sample = false, $no_images = false) {
-               if(intval(get_config('system','no_smilies'))
-                       || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
+               if(intval(Config::get('system','no_smilies'))
+                       || (local_user() && intval(PConfig::get(local_user(),'system','no_smilies'))))
                        return $s;
 
                $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::encode',$s);