CakeEmail constructor now accepts $config

cakephp · Aug 17, 2011 · 138aae6 · 138aae6
1 parent 803cd28
commit 138aae6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
@@ -270,13 +270,17 @@ class CakeEmail {
 
 /**
  * Constructor
+ * @param mixed $config Array of configs, or string to load configs from email.php
  *
  */
-	public function __construct() {
+	public function __construct($config = null) {
 		$charset = Configure::read('App.encoding');
 		if ($charset !== null) {
 			$this->charset = $charset;
 		}
+		if ($config) {
+			$this->config($config);
+		}
 	}
 
 /**