From 60096e5d6132eb45aaf542c8c646ef677daf5104 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 30 Jun 2010 10:00:06 +0000 Subject: - Fix body in message_sent hook when delay_file_io=true (#1486824) git-svn-id: https://svn.roundcube.net/trunk@3796 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/func.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index e265c9c1e..4603ad908 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -1374,10 +1374,6 @@ function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_ $smtp_response = $RCMAIL->smtp->get_response(); $smtp_error = $RCMAIL->smtp->get_error(); - if (is_resource($msg_body)) { - fclose($msg_body); - } - // log error if (!$sent) raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__, @@ -1442,6 +1438,10 @@ function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_ } } + if (is_resource($msg_body)) { + fclose($msg_body); + } + $message->_headers = array(); $message->headers($headers); -- cgit v1.2.3