Skip to content

Commit

Permalink
Load config file before checking class existence.
Browse files Browse the repository at this point in the history
Closes #7465
  • Loading branch information
ADmad committed Sep 28, 2015
1 parent dad9eaa commit c3e08fd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Cake/Network/Email/CakeEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public function __construct($config = null) {

if ($config) {
$this->config($config);
} elseif (class_exists($this->_configClass) && config('email')) {
} elseif (config('email') && class_exists($this->_configClass)) {
$this->_configInstance = new $this->_configClass();
if (isset($this->_configInstance->default)) {
$this->config('default');
Expand Down

0 comments on commit c3e08fd

Please sign in to comment.