X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=411f03b463f0204573b6e28df8d104438d452230;hb=65b86fe0d556829c09e8c8f5c707b868ad37dfe1;hp=08c6309018f3335726f23d5b008e29eea7662dec;hpb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 08c6309018..411f03b463 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.
*
@@ -137,7 +142,7 @@ class Smilies
'
',
'
',
'
',
- '~friendica
',
+ '~friendica
',
'red
matrix',
'red
matrix'
];
@@ -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,8 +213,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 +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
*