Changeset 998 in subversion for trunk/roundcubemail/program/steps/mail/compose.inc

Timestamp:

Feb 2, 2008 3:30:01 PM (5 years ago)

Author:

thomasb

Message:

Also respect receipt and priority settings when re-opening a draft message

File:

• trunk/roundcubemail/program/steps/mail/compose.inc (modified) (4 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -737 +737 @@
 function rcmail_priority_selector($attrib)
 {
+  global $MESSAGE;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -750 +752 @@
                  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" : '';
@@ -762 +764 @@
 function rcmail_receipt_checkbox($attrib)
 {
+  global $MESSAGE;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -773 +777 @@
 
   $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" : '';