[Svn] r3796 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Wed Jun 30 12:00:06 CEST 2010


Author: alec
Date: 2010-06-30 05:00:06 -0500 (Wed, 30 Jun 2010)
New Revision: 3796

Modified:
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
- Fix body in message_sent hook when delay_file_io=true (#1486824)


Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2010-06-30 09:44:33 UTC (rev 3795)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2010-06-30 10:00:06 UTC (rev 3796)
@@ -1374,10 +1374,6 @@
     $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 @@
     }
   }
 
+  if (is_resource($msg_body)) {
+    fclose($msg_body);
+  }
+
   $message->_headers = array();
   $message->headers($headers);
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list