From ae787c5ef27c08ca26d5c14045029c6cf73cdb4a Mon Sep 17 00:00:00 2001 From: Christoph Klaffl Date: Thu, 22 Aug 2024 19:39:23 +0200 Subject: [PATCH] fix call to custom mail_template_class Signed-off-by: Christoph Klaffl --- lib/private/Mail/Mailer.php | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 4ddb748fc26..71d9aca9aeb 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -103,18 +103,6 @@ class Mailer implements IMailer { * @since 12.0.0 */ public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate { - $class = $this->config->getSystemValueString('mail_template_class', ''); - - if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) { - return new $class( - $this->defaults, - $this->urlGenerator, - $this->l10nFactory, - $emailId, - $data - ); - } - $logoDimensions = $this->config->getAppValue('theming', 'logoDimensions', self::DEFAULT_DIMENSIONS); if (str_contains($logoDimensions, 'x')) { [$width, $height] = explode('x', $logoDimensions); @@ -140,6 +128,20 @@ class Mailer implements IMailer { $logoWidth = $logoHeight = null; } + $class = $this->config->getSystemValueString('mail_template_class', ''); + + if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) { + return new $class( + $this->defaults, + $this->urlGenerator, + $this->l10nFactory, + $logoWidth, + $logoHeight, + $emailId, + $data + ); + } + return new EMailTemplate( $this->defaults, $this->urlGenerator, -- 2.39.5