Limit smilies replacement to BBCode::convert

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index e4227cd7d09f57632043bae8dda3cf4282c71450..052bdc4c3c3f76edc43de78f96436eea4ad3084d 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -143,13 +143,9 @@ function redir_private_images($a, &$item)
  * @return string Formattet HTML.
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function prepare_text($text) {
-       if (stristr($text, '[nosmile]')) {
-               $s = BBCode::convert($text);
-       } else {
-               $s = Smilies::replace(BBCode::convert($text));
-       }
-
+function prepare_text($text)
+{
+       $s = BBCode::convert($text);
        return trim($s);
 }