- Fix: when From field is a first object in compose template form's hidden ...

alecpl

2010-06-18 8958d01311b529b2896f8b55b7864118eeb864a5

- Fix: when From field is a first object in compose template form's hidden fields aren't added to the output

 program/steps/mail/compose.inc

@@ -204,7 +204,7 @@
  switch ($part)
  {
    case 'from':
      return rcmail_compose_header_from($attrib);
      return $form_start . rcmail_compose_header_from($attrib);

    case 'to':
      $fname = '_to';
@@ -411,9 +411,6 @@
    $input_from = new html_inputfield($field_attrib);
    $out = $input_from->show($_POST['_from']);
  }
  
  if ($form_start)
    $out = $form_start.$out;

  return $out;
}
@@ -1100,7 +1097,7 @@
  global $RCMAIL, $MESSAGE_FORM;

  $form_start = '';
  if (!strlen($MESSAGE_FORM))
  if (!$MESSAGE_FORM)
  {
    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
    $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
@@ -1109,10 +1106,10 @@
    $form_start .= $hiddenfields->show();
  }
    
  $form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
  $form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
  $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
  
  if (!strlen($MESSAGE_FORM))
  if (!$MESSAGE_FORM)
    $RCMAIL->output->add_gui_object('messageform', $form_name);
  
  $MESSAGE_FORM = $form_name;