Changed to be able to configure empty array in CakeEmail.

cakephp · Apr 17, 2011 · c48db36 · c48db36
1 parent c5f289f
commit c48db36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeEmail.php b/lib/Cake/Network/CakeEmail.php
@@ -784,7 +784,7 @@ public function message() {
  * @return mixed
  */
 	public function config($config = null) {
-		if (empty($config)) {
+		if ($config === null) {
 			return $this->_config;
 		}
 

diff --git a/lib/Cake/tests/Case/Network/CakeEmailTest.php b/lib/Cake/tests/Case/Network/CakeEmailTest.php
@@ -456,6 +456,10 @@ public function testConfig() {
 		$config = array('test' => 'ok', 'test2' => true);
 		$this->CakeEmail->config($config);
 		$this->assertIdentical(DebugTransport::$config, $config);
+		$this->assertIdentical($this->CakeEmail->config(), $config);
+
+		$this->CakeEmail->config(array());
+		$this->assertIdentical(DebugTransport::$config, array());
 	}
 
 /**