Limit smilies replacement to BBCode::convert

2019-06-20 15:00:33 -04:00
parent 5e4ace271b
commit 9545ff614b
3 changed files with 6 additions and 9 deletions
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -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);
 		}