cleanup reset of email

dereuromark · Nov 13, 2014 · 9b8618d · 9b8618d
1 parent f21adec
commit 9b8618d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Lib/EmailLib.php b/Lib/EmailLib.php
@@ -55,7 +55,7 @@ public function __construct($config = null) {
 		}
 		parent::__construct($config);
 
-		$this->resetAndSet();
+		$this->resetAndSet($config);
 	}
 
 	/**
@@ -632,15 +632,21 @@ protected function _logEmail($append = null) {
 	 *
 	 * @return void
 	 */
-	public function resetAndSet() {
+	public function resetAndSet($config = null) {
+		if ($config === null) {
+			$config = 'default';
+		}
 		parent::reset();
+
 		$this->_priority = null;
 		$this->_wrapLength = null;
 
 		$this->_log = null;
 		$this->_error = null;
 		$this->_debug = null;
 
+		$this->_applyConfig($config);
+
 		if ($fromEmail = Configure::read('Config.systemEmail')) {
 			$fromName = Configure::read('Config.systemName');
 		} else {