FIX better text content for multipart email

Dolibarr · Jun 18, 2018 · f9f7d36 · f9f7d36
1 parent c3f64ed
commit f9f7d36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
@@ -1062,8 +1062,8 @@ function write_body($msgtext)
 		if ($this->msgishtml)
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
 
 			// Check if html header already in message, if not complete the message

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
@@ -1361,8 +1361,8 @@ function setBodyContent($strContent, $strType = 'plain')
 		if ($strType == 'html')
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
 		}