lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert change that create not required new lines

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-06 00:51:26 +01:00
parent b3feb6b095
commit 027d94d41a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/CMailFile.class.php
View File

@ -1126,9 +1126,9 @@ class CMailFile
if ($this->msgishtml) if ($this->msgishtml)
{ {
// Similar code to forge a text from html is also in smtps.class.php // Similar code to forge a text from html is also in smtps.class.php
$strContentAltText = preg_replace("/<br\s*[^>]*>/", "\n", $strContent); $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
$strContentAltText = html_entity_decode(strip_tags($strContentAltText)); $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n")); $strContentAltText = trim(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 // Check if html header already in message, if not complete the message
$strContent = $this->checkIfHTML($strContent); $strContent = $this->checkIfHTML($strContent);

4
htdocs/core/class/smtps.class.php
View File

@ -1383,9 +1383,9 @@ class SMTPs
if ($strType == 'html') if ($strType == 'html')
{ {
// Similar code to forge a text from html is also in CMailFile.class.php // Similar code to forge a text from html is also in CMailFile.class.php
$strContentAltText = preg_replace("/<br\s*[^>]*>/", "\n", $strContent); $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
$strContentAltText = html_entity_decode(strip_tags($strContentAltText)); $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n")); $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
} }
// Make RFC2045 Compliant // Make RFC2045 Compliant