Merge remote-tracking branch 'upstream/develop' into delivery-statistics

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 61fe707b40473d26b53b0ef8d5a16acb93f3617b..da09e13dd9b8dfc5a243a9480d4b3de5b9207186 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -357,7 +357,7 @@ class BBCode extends BaseObject
         */
        public static function toPlaintext($text, $keep_urls = true)
        {
-               $naked_text = preg_replace('/\[(.+?)\]\s*/','', $text);
+               $naked_text = preg_replace('/\[.+?\]/','', $text);
                if (!$keep_urls) {
                        $naked_text = preg_replace('#https?\://[^\s<]+[^\s\.\)]#i', '', $naked_text);
                }
@@ -1395,6 +1395,7 @@ class BBCode extends BaseObject
 
                // This is actually executed in Item::prepareBody()
 
+               $nosmile = strpos($text, '[nosmile]') !== false;
                $text = str_replace('[nosmile]', '', $text);
 
                // Check for font change text
@@ -1572,7 +1573,7 @@ class BBCode extends BaseObject
                }
 
                // Replace non graphical smilies for external posts
-               if ($simple_html) {
+               if (!$nosmile && !$for_plaintext) {
                        $text = Smilies::replace($text);
                }