summaryrefslogtreecommitdiff
path: root/program/steps/mail/compose.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-11-19 08:45:19 +0000
committeralecpl <alec@alec.pl>2010-11-19 08:45:19 +0000
commitd2b8840a0e1c6877716517727ec9e1bbded20733 (patch)
treed969463daaf88a1f2264c31b0eb75dd1e5f27197 /program/steps/mail/compose.inc
parente9a974990e6bceb2db0f814bc09671e36d441da6 (diff)
- Fix handling of custom "_from" in sendmail (#1487132)
- Small fix in displaying Sender input field
Diffstat (limited to 'program/steps/mail/compose.inc')
-rw-r--r--program/steps/mail/compose.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 3f2b8c5d2..ec9b4ef0d 100644
--- a/program/steps/mail/compose.inc
+++ b/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;