Don't allow TO field to be blank; adjust auto-detection of FROM for reply-all actions...

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

diff --git a/src/compose.php b/src/compose.php
index b0a1e99ff2e6aa29f92fd088d78fdaacd0bcdad4..c2f852975cfe89c306406dce801ab1353e7daa8e 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1000,10 +1000,12 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                             // if this is a reply-all, the original recipient
                             // is already in the CC field, so we can just blank
                             // the recipient (TO field) (as long as the CC field
                             // if this is a reply-all, the original recipient
                             // is already in the CC field, so we can just blank
                             // the recipient (TO field) (as long as the CC field

-                            // isn't empty that is) and we're done
+                            // isn't empty that is)... but then move the CC into
+                            // the TO, so TO isn't empty

                             //
                             if ($action == 'reply_all' && !empty($send_to_cc)) {
                             //
                             if ($action == 'reply_all' && !empty($send_to_cc)) {

-                                $send_to = '';
+                                $orig_to = $send_to_cc;
+                                $send_to_cc = '';

                                 break;
                             }
 
                                 break;
                             }