DataObjects/Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 9d332b5..f912cf0 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -340,6 +340,10 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         if (isset($contents['rcpts'])) {
             $cfg['rcpts'] = $contents['rcpts'];
         }
+        if (isset($contents['mailer_opts']) && is_array($contents['mailer_opts'])) {
+            $cfg = array_merge($contents['mailer_opts'], $cfg);
+        }
+        
         
         $r = new Pman_Core_Mailer($cfg);