Browse Source

Make email default configurable for testing.

Mark Scherer 9 years ago
parent
commit
4ec0caf7ad
1 changed files with 3 additions and 2 deletions
  1. 3 2
      Lib/EmailLib.php

+ 3 - 2
Lib/EmailLib.php

@@ -52,7 +52,7 @@ class EmailLib extends CakeEmail {
 
 
 	public function __construct($config = null) {
 	public function __construct($config = null) {
 		if ($config === null) {
 		if ($config === null) {
-			$config = 'default';
+			$config = Configure::read('Email.config') ?: 'default';
 		}
 		}
 		parent::__construct($config);
 		parent::__construct($config);
 
 
@@ -656,7 +656,7 @@ class EmailLib extends CakeEmail {
 	 */
 	 */
 	public function reset($config = null) {
 	public function reset($config = null) {
 		if ($config === null) {
 		if ($config === null) {
-			$config = 'default';
+			$config = Configure::read('Email.config') ?: 'default';
 		}
 		}
 		parent::reset();
 		parent::reset();
 
 
@@ -667,6 +667,7 @@ class EmailLib extends CakeEmail {
 		$this->_error = null;
 		$this->_error = null;
 		$this->_debug = null;
 		$this->_debug = null;
 
 
+		$this->_config = (array)Configure::read('Email');
 		$this->_applyConfig($config);
 		$this->_applyConfig($config);
 
 
 		if ($fromEmail = Configure::read('Config.systemEmail')) {
 		if ($fromEmail = Configure::read('Config.systemEmail')) {