From 491a72d1163c5cc38ed3a217be7a251cb1bd7d11 Mon Sep 17 00:00:00 2001 From: Stefan Galinski <stefan@sgalinski.de> Date: Wed, 5 Oct 2016 19:31:50 +0200 Subject: [PATCH] [BUGFIX] Fix some final issues --- Classes/Controller/MailController.php | 4 ++-- Classes/Service/MailTemplateService.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php index 2a0ba670..a7b04526 100644 --- a/Classes/Controller/MailController.php +++ b/Classes/Controller/MailController.php @@ -253,7 +253,7 @@ class MailController extends ActionController { $mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setTemplateName($selectedTemplateKey); $mailTemplateService->setExtensionKey($selectedExtensionKey); - $mailIsSend = $mailTemplateService->sendEmail($this->settings['mail']['test']['subject'], TRUE); + $mailIsSend = $mailTemplateService->sendEmail(TRUE); if ($selectedLanguageRight !== $selectedLanguageLeft) { /** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */ @@ -263,7 +263,7 @@ class MailController extends ActionController { $mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setTemplateName($selectedTemplateKey); $mailTemplateService->setExtensionKey($selectedExtensionKey); - $mailIsSend = $mailTemplateService->sendEmail($this->settings['mail']['test']['subject'], TRUE); + $mailIsSend = $mailTemplateService->sendEmail(TRUE); } if ($mailIsSend) { diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php index 427407c1..17e0a9dd 100644 --- a/Classes/Service/MailTemplateService.php +++ b/Classes/Service/MailTemplateService.php @@ -168,6 +168,7 @@ class MailTemplateService { * @param string $templatePath * @param string $description * @param array $markers + * @param array $subjects */ public static function registerTemplate( $extension, $templateName, $templatePath, $description, array $markers, array $subjects @@ -194,15 +195,14 @@ class MailTemplateService { /** * Send the Email * - * @param string $subject * @param boolean $isPreview * @return boolean email was sent or added to mail queue successfully? */ - public function sendEmail($subject = '', $isPreview = FALSE) { + public function sendEmail($isPreview = FALSE) { /** @var Template $template */ - $template = $this->templateRepository->findTemplate( + $template = $this->templateRepository->findOneByTemplate( $this->extensionKey, $this->templateName, $this->language - )->getFirst(); + ); // If there is no template for this language, use the default template if ($template === NULL) { -- GitLab