Fixing issue #5764

cakephp · Feb 19, 2015 · e3b5306 · e3b5306
1 parent 8f50f1e
commit e3b5306
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
@@ -353,6 +353,10 @@ public function __construct($config = null) {
 
 		if ($config) {
 			$this->config($config);
+		} elseif (config('email')) {
+			if (property_exists($this->_configClass, 'default')) {
+				$this->config('default');
+			}
 		}
 		if (empty($this->headerCharset)) {
 			$this->headerCharset = $this->charset;

diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -2449,4 +2449,23 @@ public function assertLineLengths($message) {
 		}
 	}
 
+/**
+ * Test if the EmailConfig::$default configuration is read when present
+ *
+ * @return void
+ */
+	public function testDefaultConfig() {
+		$defaultConfig = new File(APP . 'Config' . DS . 'email.php.default');
+		$emailConfig = new File(APP . 'Config' . DS . 'email.php');
+		$hasConfig = $emailConfig->exists();
+		$this->skipIf(!$defaultConfig->copy(APP . 'Config' . DS . 'email.php', false));
+
+		$Email = new CakeEmail();
+		$this->skipIf(!property_exists('EmailConfig', 'default'));
+		$this->assertEquals('you@localhost', current($Email->from()));
+		if (!$hasConfig) {
+			$emailConfig->delete();
+		}
+	}
+
 }