From ce66292fe47d4621d41b11333ed942b007f35863 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 19 May 2016 14:04:10 +0900 Subject: [PATCH] Automatically recognize the current default sending method --- common/framework/mail.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/common/framework/mail.php b/common/framework/mail.php index e6dffade5..f82469e65 100644 --- a/common/framework/mail.php +++ b/common/framework/mail.php @@ -43,7 +43,17 @@ class Mail { if (!self::$default_driver) { - self::$default_driver = Drivers\Mail\MailFunction::getInstance(array()); + $default_driver = config('mail.type'); + $default_driver_class = '\\Rhymix\\Framework\\Drivers\Mail\\' . $default_driver; + if (class_exists($default_driver_class)) + { + $default_driver_config = config('mail.' . $default_driver) ?: array(); + self::$default_driver = $default_driver_class::getInstance($default_driver_config); + } + else + { + self::$default_driver = Drivers\Mail\MailFunction::getInstance(array()); + } } return self::$default_driver; }