Merge pull request #7469 from cakephp/issue-7465

Load config file before checking class existence.
This commit is contained in:
Mark Story 2015-09-28 15:43:53 -04:00
commit 5a8a7800ae

View file

@ -360,7 +360,7 @@ class CakeEmail {
if ($config) { if ($config) {
$this->config($config); $this->config($config);
} elseif (class_exists($this->_configClass) && config('email')) { } elseif (config('email') && class_exists($this->_configClass)) {
$this->_configInstance = new $this->_configClass(); $this->_configInstance = new $this->_configClass();
if (isset($this->_configInstance->default)) { if (isset($this->_configInstance->default)) {
$this->config('default'); $this->config('default');