From dfae157cc5de789c3a22f159916ff262a189594f Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 30 Jul 2013 17:29:24 +0200 Subject: [PATCH 1/2] Fix : email message combined with html signature made troubles with line breaks --- htdocs/core/class/html.formmail.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 37ad8a6384c..25c234969a2 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -575,9 +575,11 @@ 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.= ''; $out.= ''.$langs->trans("MailText").''; From c40e18784211e8f0890f83bf59073402d3f27e0d Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 30 Jul 2013 17:30:09 +0200 Subject: [PATCH 2/2] Typo --- htdocs/core/class/html.formmail.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 25c234969a2..e2968601f30 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -579,7 +579,6 @@ class FormMail if($conf->global->FCKEDITOR_ENABLE_MAIL) $defaultmessage=nl2br($defaultmessage); $defaultmessage=make_substitutions($defaultmessage,$this->substit); if (isset($_POST["message"])) $defaultmessage=$_POST["message"]; - $out.= ''; $out.= ''.$langs->trans("MailText").'';