X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fmailer%2Fclass_BaseMailer.php;h=db07b20d85a0de511900cc5b0f0dc89bcb68a5fd;hb=5203f9bd014ad46fbc7ee54e7223dcd46e14e3b4;hp=8e7a1545a399cde9d2a0e2c034def3aac36f9549;hpb=95673c6dbd12d46bed603a2724437ed863e3215b;p=core.git

diff --git a/inc/classes/main/mailer/class_BaseMailer.php b/inc/classes/main/mailer/class_BaseMailer.php
index 8e7a1545..db07b20d 100644
--- a/inc/classes/main/mailer/class_BaseMailer.php
+++ b/inc/classes/main/mailer/class_BaseMailer.php
@@ -2,11 +2,11 @@
 /**
  * A general mailer class for all other mailers
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 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.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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