From ff08eed202d77935f277bf221f753dad6f657fdb Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 2 Feb 2008 20:30:01 +0000 Subject: Also respect receipt and priority settings when re-opening a draft message --- program/steps/mail/compose.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 915d5a03a..908bc277e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -736,6 +736,8 @@ function rcmail_compose_attachment_field($attrib) function rcmail_priority_selector($attrib) { + global $MESSAGE; + list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); @@ -749,7 +751,7 @@ function rcmail_priority_selector($attrib) rcube_label('highest')), array(5, 4, 0, 2, 1)); - $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0; + $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE['headers']->priority); $out = $form_start ? "$form_start\n" : ''; $out .= $selector->show($sel); @@ -761,6 +763,8 @@ function rcmail_priority_selector($attrib) function rcmail_receipt_checkbox($attrib) { + global $MESSAGE; + list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); @@ -772,7 +776,7 @@ function rcmail_receipt_checkbox($attrib) $checkbox = new checkbox($attrib); $out = $form_start ? "$form_start\n" : ''; - $out .= $checkbox->show(0); + $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0); $out .= $form_end ? "\n$form_end" : ''; return $out; -- cgit v1.2.3