Merge pull request #1145 from atm-maxime/develop

Fix : email message combined with html signature made troubles with line breaks
Dolibarr · Aug 1, 2013 · 2fa1032 · 2fa1032
2 parents 70eef21 + 3395df2
commit 2fa1032
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
@@ -575,9 +575,10 @@ function get_form($addfileaction='addfile',$removefileaction='removefile')
         			}
         		}
 
+				$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>';