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

trac at roundcube.net trac at roundcube.net
Tue Mar 23 11:01:32 CET 2010


Author: alec
Date: 2010-03-23 05:01:32 -0500 (Tue, 23 Mar 2010)
New Revision: 3403

Modified:
   trunk/roundcubemail/program/steps/mail/compose.inc
Log:
- Allow to override identity when composing a message (#1486466)


Modified: trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/compose.inc	2010-03-23 09:53:08 UTC (rev 3402)
+++ trunk/roundcubemail/program/steps/mail/compose.inc	2010-03-23 10:01:32 UTC (rev 3403)
@@ -377,7 +377,7 @@
       if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
         $MESSAGE->compose_from[] = $sql_arr['email'];
 
-      if (empty($_POST['_from']))
+      if (empty($_POST['_from']) && empty($_SESSION['compose']['param']['from']))
       {
         // set draft's identity
         if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
@@ -391,6 +391,8 @@
     // overwrite identity selection with post parameter
     if (!empty($_POST['_from']))
       $from_id = get_input_value('_from', RCUBE_INPUT_POST);
+    else if (!empty($_SESSION['compose']['param']['from']))
+      $from_id = $_SESSION['compose']['param']['from'];
 
     $out = $select_from->show($from_id);
 

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



More information about the Svn mailing list