Merge pull request #17868 from prolyfix/patch-1

bug resolution: exception
This commit is contained in:
Laurent Destailleur 2021-06-10 12:09:20 +02:00 committed by GitHub
commit 32491dc668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -345,7 +345,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$subject = make_substitutions($subject, $substitutionarray);
$message = make_substitutions($message, $substitutionarray);
if (method_exists($object, 'makeSubstitution')) {
if (is_object($object) && method_exists($object, 'makeSubstitution')) {
$subject = $object->makeSubstitution($subject);
$message = $object->makeSubstitution($message);
}