Skip to content
Permalink
Browse files

making the config method of email-transport-classes mergable into the…

… current config value.
  • Loading branch information...
fuga committed Aug 12, 2013
1 parent 1bdcc58 commit 303261e23199efb3647feb622d5ed9e125dbd4cf
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/Cake/Network/Email/AbstractTransport.php
  2. +1 −1 lib/Cake/Network/Email/SmtpTransport.php
@@ -48,7 +48,7 @@ abstract class AbstractTransport {
*/
public function config($config = null) {
if (is_array($config)) {
$this->_config = $config;
$this->_config = $config + $this->_config;
}
return $this->_config;
}
@@ -86,7 +86,7 @@ public function config($config = null) {
'client' => null,
'tls' => false
);
$this->_config = empty($config) ? $this->_config + $default : $config + $default;
$this->_config = array_merge($default, $this->_config, $config);
return $this->_config;
}

0 comments on commit 303261e

Please sign in to comment.
You can’t perform that action at this time.