Merge pull request #14066 from atm-gauthier/10.0_fix_arraydefaultmessage

FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/c…
This commit is contained in:
Laurent Destailleur 2020-06-11 22:59:55 +02:00 committed by GitHub
commit e3811840df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -991,9 +991,7 @@ class FormTicket
// MESSAGE
$defaultmessage="";
if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) {
$defaultmessage=$arraydefaultmessage->content;
}
if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) $defaultmessage = $arraydefaultmessage->content;
$defaultmessage=str_replace('\n', "\n", $defaultmessage);
// Deal with format differences between message and signature (text / HTML)