fixed a configuration bug

azt3k · Jun 2, 2015 · 6905622 · 6905622
1 parent ee5111f
commit 6905622
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/code/SmtpMailer.php b/code/SmtpMailer.php
@@ -4,10 +4,7 @@ class SmtpMailer extends Mailer {
 
     public $mailer = null;
 
-    /**
-     * @config
-     */
-    private static $conf = array(
+    private static $defaults = array(
         'default_from'      =>  array(
             'name'  => 'admin',
             'email' => 'admin@localhost'
@@ -23,6 +20,11 @@ class SmtpMailer extends Mailer {
         'lang'              => 'en'
     );
 
+    /**
+     * @config
+     */
+    private static $conf = array();
+
     /**
      * Constructor
      *
@@ -45,14 +47,15 @@ public static function set_conf($conf) {
      *  @return stdClass
      */
     public static function get_conf() {
-        return (object) static::$conf;
+        return (object) static::array_merge_recursive_distinct(static::$defaults, static::$conf);
     }
 
     /**
      * @return void
      */
     protected static function set_conf_from_yaml() {
         $conf = (array) Config::inst()->get('SmtpMailer', 'conf');
+        // die(print_r($conf,1));
         if (!empty($conf))
             static::$conf = static::array_merge_recursive_distinct(static::$conf, $conf);
     }