Merge pull request #1706 from ppp0/issue-1706

Move mail delivery agent configuration to protected function
cargomedia · Mar 24, 2015 · a630543 · a630543
2 parents e65b10c + 47da62d
commit a630543
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/library/CM/Mail.php b/library/CM/Mail.php
@@ -355,6 +355,16 @@ protected function _render($language) {
         return $renderAdapter->fetch();
     }
 
+    /**
+     * @return string|null
+     */
+    protected function _getMailDeliveryAgent() {
+        return $this->_getConfig()->mailDeliveryAgent;
+    }
+
+    /**
+     * @throws CM_Exception_Invalid
+     */
     protected function _send($subject, $text, $html = null) {
         if (!self::_getConfig()->send) {
             $this->_log($subject, $text);
@@ -374,7 +384,7 @@ protected function _send($subject, $text, $html = null) {
             foreach ($this->_bcc as $bcc) {
                 $mail->AddBCC($bcc['address'], $bcc['name']);
             }
-            if ($mailDeliveryAgent = $this->_getConfig()->mailDeliveryAgent) {
+            if ($mailDeliveryAgent = $this->_getMailDeliveryAgent()) {
                 $mail->AddCustomHeader('X-MDA: ' . $mailDeliveryAgent);
             }
             $mail->SetFrom($this->_sender['address'], $this->_sender['name']);