Changeset 326

Show
Ignore:
Timestamp:
08/13/09 02:19:37 (2 years ago)
Author:
john
Message:

added second param to mail_mime->headers(->headers, true) to make it overwrite previously set headers

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/trax/vendor/trax/action_mailer.php

    r313 r326  
    114114        if(!is_null($this->recipients)) { 
    115115            $recipients = $this->format_emails($this->recipients, "To"); 
    116             $this->set_header_line("To", $recipients);             
     116            $this->set_header_line("To", $recipients);  
    117117        } 
    118118         
    … …  
    257257            
    258258        $this->body = $this->mail_mime->get($this->mime_params);       
    259         $this->headers = $this->mail_mime->headers($this->headers);   
     259        $this->headers = $this->mail_mime->headers($this->headers, true);   
    260260 
    261261        if($this->delivery_method == "sendmail") { 
    … …  
    332332     */     
    333333    function deliver($mail = null) { 
    334         if(is_null($mail)) { 
     334        if(is_null($mail)) {   
    335335            $mail =& $this;                
    336336        }  
    … …  
    340340                return true;     
    341341            } 
    342             if(!count($this->errors)) {  
     342            if(!count($this->errors)) {   
     343                #error_log("delivering message to:".$mail->headers['To']); 
    343344                $result = $mail->mail->send($mail->headers['To'], $mail->headers, $mail->body); 
    344345                if(is_object($result)) {