Improve last fix so it also remove temp file if Mail_Mime returned an error

7 years ago · 6dce805221
parent 1767b256e4
commit 6dce805221
1 changed files with 3 additions and 4 deletions
--- a/program/include/rcmail_sendmail.php
+++ b/program/include/rcmail_sendmail.php
@ -469,12 +469,11 @@ class rcmail_sendmail
                        $msg = $message->mailbody_file;
                    }
                    else {
-                        $mailbody_file = rcube_utils::temp_filename('msg');
-                        $msg           = $message->saveMessageBody($mailbody_file);
+                        $message->mailbody_file = rcube_utils::temp_filename('msg');
+                        $msg = $message->saveMessageBody($message->mailbody_file);

                        if (!is_a($msg, 'PEAR_Error')) {
-                            $msg = $mailbody_file;
-                            $message->mailbody_file = $mailbody_file;
+                            $msg = $message->mailbody_file;
                        }
                    }
                }