From a0738e86d8464151c06a6f3c4c7eea6c4aff4b8e Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 2 Aug 2013 10:24:09 +0200 Subject: [PATCH] Better fix for email text / signature integration --- htdocs/core/class/html.formmail.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index e2968601f30..e11bd0c109e 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -576,7 +576,14 @@ class FormMail } $defaultmessage=str_replace('\n',"\n",$defaultmessage); - if($conf->global->FCKEDITOR_ENABLE_MAIL) $defaultmessage=nl2br($defaultmessage); + + // Deal with format differences between message and signature (text / HTML) + if(dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__SIGNATURE__'])) { + $this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']); + } else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) { + $defaultmessage = dol_nl2br($defaultmessage); + } + $defaultmessage=make_substitutions($defaultmessage,$this->substit); if (isset($_POST["message"])) $defaultmessage=$_POST["message"];