X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fmailer%2Fclass_BaseMailer.php;h=db07b20d85a0de511900cc5b0f0dc89bcb68a5fd;hb=eceddfea4c386fff2760fa6f3592a242809cbf7a;hp=cd2de7ab3b2228fe9ee33581b8588c113508e27a;hpb=1aeb70ce8eaec89e629ed6fe544e1d5a0618fe1b;p=core.git diff --git a/inc/classes/main/mailer/class_BaseMailer.php b/inc/classes/main/mailer/class_BaseMailer.php index cd2de7ab..db07b20d 100644 --- a/inc/classes/main/mailer/class_BaseMailer.php +++ b/inc/classes/main/mailer/class_BaseMailer.php @@ -52,9 +52,7 @@ class BaseMailer extends BaseFrameworkSystem { $templatePrefix = $this->getConfigInstance()->getConfigEntry('email_tpl_' . $templateName); // Load this email template - // @TODO This needs testing/fixes because the deprecated method - // loadEmailTemplate() has been removed from interface CompileableTemplate. - $this->getTemplateInstance()->loadCodeTemplate($templatePrefix . '_' . $templateName); + $this->getTemplateInstance()->loadEmailTemplate($templatePrefix . '_' . $templateName); } /** @@ -162,7 +160,7 @@ class BaseMailer extends BaseFrameworkSystem { $templateName = $this->getTemplateName(); // Does the subject line exist? - if ((!empty($templateName)) && ($this->isGenericArrayElementSet('recipients', $templateName, 'generic', 'subject']))) { + if ((!empty($templateName)) && ($this->isGenericArrayElementSet('recipients', $templateName, 'generic', 'subject'))) { // Then use it $subjectLine = $this->getGenericArrayElement('recipients', $templateName, 'generic', 'subject'); } // END - if