Remove deprecated code

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

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 08c6309018f3335726f23d5b008e29eea7662dec..7a42f9ba47c16c64a66d3b91e1defc1c3c4985f9 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -2,7 +2,7 @@
 
 /**
  * @file src/Content/Smilies.php
- * @brief This file contains the Smilies class which contains functions to handle smiles
+ * This file contains the Smilies class which contains functions to handle smiles
  *
  * @todo Use the shortcodes from here:
  * https://github.com/iamcal/emoji-data/blob/master/emoji_pretty.json?raw=true
@@ -14,9 +14,7 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
@@ -27,7 +25,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 +48,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 +178,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,8 +206,8 @@ class Smilies
         */
        public static function replaceFromArray($text, array $smilies, $no_images = false)
        {
-               if (intval(Config::get('system', 'no_smilies'))
-                       || (local_user() && intval(PConfig::get(local_user(), '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 +259,7 @@ class Smilies
 
 
        /**
-        * @brief expand <3333 to the correct number of hearts
+        * expand <3333 to the correct number of hearts
         *
         * @param string $x string
         *