X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FBBCode.php;h=da09e13dd9b8dfc5a243a9480d4b3de5b9207186;hb=9bf065c9d8343ff2d2b6b5a7514a78471a0bedd4;hp=61fe707b40473d26b53b0ef8d5a16acb93f3617b;hpb=d54e778f30c9b8b9c899895d2f98371c842ee207;p=friendica.git

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 61fe707b40..da09e13dd9 100644
--- 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);
 		}