Changeset 289 for trunk/trax/vendor/trax/action_mailer.php

Timestamp:

05/22/07 04:04:25 (5 years ago)

Author:

john

Message:

fixed ActionMailer? bug in the deliver method now will send again

Files:

• trunk/trax/vendor/trax/action_mailer.php (modified) (5 diffs)

trunk/trax/vendor/trax/action_mailer.php

@@ -139 +139 @@
         
         if(!is_null($this->subject))  {
-            $this->set_header_line("Subject", $this->subject);
+            $this->set_header_line("Subject", ereg_replace("[\n\r]", "", $this->subject));
         } else {
             $this->set_header_line("Subject", "");
@@ -224 +224 @@
         $this->head_charset = $this->head_charset ? $this->head_charset : $this->default_charset;
         $this->html_charset = $this->html_charset ? $this->html_charset : $this->default_charset;
-        $this->text_charset = $this->text_charset ? $this->text_charset : $this->default_charset;
-        $this->mime_params = array(
-            'head_charset' => $this->head_charset, 
-            'html_charset' =>  $this->html_charset,
-            'text_charset' =>  $this->text_charset
-        );         
+        $this->text_charset = $this->text_charset ? $this->text_charset : $this->default_charset;        
     }
 
@@ -241 +236 @@
             //echo "calling $method_name<br>";
             call_user_func_array(array($this, $method_name), $parameters);   
-        }   
+        } 
+        $this->mime_params = array(
+            'head_charset' => $this->head_charset, 
+            'html_charset' =>  $this->html_charset,
+            'text_charset' =>  $this->text_charset
+        );            
         $this->set_headers();
         $body = $this->preparse_body = $this->body;
@@ -258 +258 @@
         $this->body = $this->mail_mime->get($this->mime_params);      
         $this->headers = $this->mail_mime->headers($this->headers);  
-        $this->headers['Subject'] = ereg_replace("[\n\r]", "", $this->headers['Subject']); 
 
         if($this->delivery_method == "sendmail") {
@@ -342 +341 @@
             }
             if(!count($this->errors)) { 
-                $result = $mail->mail->send(null, $mail->headers, $mail->body);
+                $result = $mail->mail->send($mail->headers['To'], $mail->headers, $mail->body);
                 if(is_object($result)) { 
                     $this->errors[] = $result->getMessage();