From 33f0da43f7cd07a67e3840a522e98e690235cabb Mon Sep 17 00:00:00 2001 From: pdontthink Date: Mon, 28 Apr 2008 02:19:12 +0000 Subject: [PATCH] Change order of arguments git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13067 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver.class.php | 10 +++++----- src/compose.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 504b61f9..11a8e138 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -52,10 +52,6 @@ class Deliver { * message inside another (OPTIONAL; caller * should ONLY specify a value for this * when the message being sent is a reply) - * @param mixed $extra Any implementation-specific variables - * can be passed in here and used in - * an overloaded version of this method - * if needed. * @param resource $imap_stream If there is an open IMAP stream in * the caller's context, it should be * passed in here. This is OPTIONAL, @@ -67,13 +63,17 @@ class Deliver { * stream is only used when $reply_id * is also non-zero, but that is subject * to change. + * @param mixed $extra Any implementation-specific variables + * can be passed in here and used in + * an overloaded version of this method + * if needed. * * @return integer The number of bytes written (or that would have been * written) to the output stream. * */ function mail(&$message, $stream=false, $reply_id=0, $reply_ent_id=0, - $extra=NULL, $imap_stream=NULL) { + $imap_stream=NULL, $extra=NULL) { $rfc822_header = &$message->rfc822_header; diff --git a/src/compose.php b/src/compose.php index ec6eb201..b218d7b7 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1721,7 +1721,7 @@ function deliverMessage(&$composeMessage, $draft=false) { } require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); - $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $sent_folder, $imap_stream); + $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $sent_folder); unset ($imap_deliver); } -- 2.25.1