Moved back to 'hub' project

[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 08f66fc4cf56563d4d777be4b0a43caff6a20a1a..71124d2f7f638d8dfe60d7ba7b76449dbb32605a 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@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -41,10 +41,6 @@ class BaseMailer extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -61,7 +57,9 @@ class BaseMailer extends BaseFrameworkSystem {
                $templatePrefix = $this->getConfigInstance()->getConfigEntry('email_tpl_' . $templateName);
 
                // Load this email template
-               $this->getTemplateInstance()->loadEmailTemplate($templatePrefix . '_' . $templateName);
+               // @TODO This needs testing/fixes because the deprecated method
+               // loadEmailTemplate() has been removed from interface CompileableTemplate.
+               $this->getTemplateInstance()->loadCodeTemplate($templatePrefix . '_' . $templateName);
        }
 
        /**
@@ -175,7 +173,7 @@ class BaseMailer extends BaseFrameworkSystem {
         */
        public final function getSubjectLine () {
                // Default subject is null
-               $subjectLine = null;
+               $subjectLine = NULL;
 
                // Get template name
                $templateName = $this->getTemplateName();
@@ -197,7 +195,7 @@ class BaseMailer extends BaseFrameworkSystem {
         */
        public function useSubjectFromTemplate () {
                // Set the subject line
-               $this->setSubjectLine("{?subject?}");
+               $this->setSubjectLine('{?subject?}');
        }
 
        /**