- Fix handling of custom "_from" in sendmail (#1487132)

- Small fix in displaying Sender input field


git-svn-id: https://svn.roundcube.net/trunk@4235 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index 3f2b8c5d2..ec9b4ef0d 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -472,7 +472,7 @@ function rcmail_compose_header_from($attrib)
       $from_id = get_input_value('_from', RCUBE_INPUT_POST);
     else if (!empty($_SESSION['compose']['param']['from']))
       $from_id = $_SESSION['compose']['param']['from'];
-    else if (count($user_identities) > 1) {
+    else {
       $return_path = $MESSAGE->headers->others['return-path'];
 
       // Set identity
@@ -501,10 +501,11 @@ function rcmail_compose_header_from($attrib)
     // add signatures to client
     $OUTPUT->set_env('signatures', $a_signatures);
   }
-  else
-  {
+  // no identities, display text input field
+  else {
+    $field_attrib['class'] = 'from_address';
     $input_from = new html_inputfield($field_attrib);
-    $out = $input_from->show($_POST['_from']);
+    $out = $input_from->show($from_id);
   }
 
   return $out;