Brought loadEmailTemplate() back to life.

[core.git] / inc / classes / main / mailer / class_BaseMailer.php

diff --git a/inc/classes/main/mailer/class_BaseMailer.php b/inc/classes/main/mailer/class_BaseMailer.php
index c1a24694ac0446b3de65b9939aefef13fb4ef946..db07b20d85a0de511900cc5b0f0dc89bcb68a5fd 100644 (file)
--- a/inc/classes/main/mailer/class_BaseMailer.php
+++ b/inc/classes/main/mailer/class_BaseMailer.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -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);
        }
 
        /**
@@ -146,7 +144,7 @@ class BaseMailer extends BaseFrameworkSystem {
         * @return      void
         */
        public final function setSubjectLine ($subjectLine) {
-       `       $this->setGenericArrayElement('recipients', $this->getTemplateName(), 'generic', 'subject', $subjectLine);
+               $this->setGenericArrayElement('recipients', $this->getTemplateName(), 'generic', 'subject', $subjectLine);
        }
 
        /**
@@ -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