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

Merge pull request #1145 from atm-maxime/develop

Browse Source 
Fix : email message combined with html signature made troubles with line breaks
This commit is contained in:
Laurent Destailleur 2013-08-01 02:09:52 -07:00
commit 2fa1032079
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/html.formmail.class.php
View File

@ -575,9 +575,10 @@ class FormMail
}
}
$defaultmessage=str_replace('\n',"\n",$defaultmessage);
if($conf->global->FCKEDITOR_ENABLE_MAIL) $defaultmessage=nl2br($defaultmessage);
$defaultmessage=make_substitutions($defaultmessage,$this->substit);
if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
$defaultmessage=str_replace('\n',"\n",$defaultmessage);
$out.= '<tr>';
$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';