Index: branches/RC/core/kernel/utility/email_send.php =================================================================== diff -u -N -r10098 -r11319 --- branches/RC/core/kernel/utility/email_send.php (.../email_send.php) (revision 10098) +++ branches/RC/core/kernel/utility/email_send.php (.../email_send.php) (revision 11319) @@ -1905,7 +1905,7 @@ * Performs mail delivery (supports delayed delivery) * * @param string $mesasge message, if not given, then use composed one - * @param bool $immediate_send send message now + * @param bool $immediate_send send message now or MailingId * @param bool $immediate_clear clear message parts after message is sent * */ @@ -1933,7 +1933,7 @@ } if ($composed) { - if ($immediate_send) { + if ($immediate_send === true) { $send_method = 'Send'.$this->sendMethod; $result = $this->$send_method($message_headers, $message_body); @@ -1949,6 +1949,7 @@ 'Queued' => adodb_mktime(), 'SendRetries' => 0, 'LastSendRetry' => 0, + 'MailingId' => (int)$immediate_send, ); $fields_hash['MessageHeaders'] = serialize($message_headers); $fields_hash['MessageBody'] =& $message_body; @@ -1961,7 +1962,7 @@ } // if not immediate send, then send result is positive :) - return !$immediate_send ? true : false; + return $immediate_send !== true ? true : false; } }