adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CakeEmail constructor now accepts $config

Browse source
This commit is contained in:
Ceeram 2011-08-17 23:15:57 +02:00
parent 803cd287c2
commit 138aae670a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Network/Email/CakeEmail.php
View file

@ -270,13 +270,17 @@ class CakeEmail {
/** /**
* Constructor * 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'); $charset = Configure::read('App.encoding');
if ($charset !== null) { if ($charset !== null) {
$this->charset = $charset; $this->charset = $charset;
} }
if ($config) {
$this->config($config);
}
} }
/** /**