Loading patches/037-mailer-template-fix.patchdeleted 100644 → 0 +0 −46 Original line number Diff line number Diff line From: Avinash <avinash.gusain.ext@murena.com> Date: Thu, 29 Aug 2024 15:50:00 +0530 Subject: [PATCH] This actually fixes error introduces in 28.0.9 Mailer.php .Already fixed on Stable 28,29 and 30. Not needed in next upgrade. --- lib/private/Mail/Mailer.php 2024-08-29 15:55:02 +++ lib/private/Mail/Mailer-new.php 2024-08-29 15:56:18 @@ -130,18 +130,6 @@ * @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); @@ -165,6 +153,19 @@ } } else { $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( Loading
patches/037-mailer-template-fix.patchdeleted 100644 → 0 +0 −46 Original line number Diff line number Diff line From: Avinash <avinash.gusain.ext@murena.com> Date: Thu, 29 Aug 2024 15:50:00 +0530 Subject: [PATCH] This actually fixes error introduces in 28.0.9 Mailer.php .Already fixed on Stable 28,29 and 30. Not needed in next upgrade. --- lib/private/Mail/Mailer.php 2024-08-29 15:55:02 +++ lib/private/Mail/Mailer-new.php 2024-08-29 15:56:18 @@ -130,18 +130,6 @@ * @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); @@ -165,6 +153,19 @@ } } else { $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(