Change order of arguments

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13067 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 504b61f9cc0c185572964f5d775f9a39dd1f5fe3..11a8e138014feb2989d585396e150d9d8c201f16 100644 (file)
--- 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 ec6eb201ed0b4dfbe9ee0242b18f0d54a1c3c914..b218d7b797f99ce0e99cc9b9ab5e8b8543a17708 100644 (file)
--- 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);
         }