Merge pull request #11359 from annando/notification

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

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 1dd40e1631bf13e5d4adf3acc379464d501f7eeb..4a20497a831c70a140135058902bac9b97117601 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -1,20 +1,26 @@
 <?php
-
 /**
- * @file src/Content/Smilies.php
- * This file contains the Smilies class which contains functions to handle smiles
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * @todo Use the shortcodes from here:
- * https://github.com/iamcal/emoji-data/blob/master/emoji_pretty.json?raw=true
- * https://raw.githubusercontent.com/emojione/emojione/master/extras/alpha-codes/eac.json?raw=true
- * https://github.com/johannhof/emoji-helper/blob/master/data/emoji.json?raw=true
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * 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;