- Fix editor type doesn't match type of message body content (#1486080)

alecpl

2009-09-03 80815d23e596528642a9321eb694715530d6f1d6

- Fix editor type doesn't match type of message body content (#1486080)

 program/steps/mail/compose.inc

@@ -393,7 +393,7 @@

  $attrib['name'] = '_message';

  if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->first_html_part()))
  if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->has_html_part()))
    $isHtml = true;
  else
    $isHtml = false;
@@ -422,7 +422,7 @@
      $body = $MESSAGE->first_text_part();
      $isHtml = false;
    }
    

    // compose reply-body
    if ($compose_mode == RCUBE_COMPOSE_REPLY)
      $body = rcmail_create_reply_body($body, $isHtml);
@@ -911,10 +911,11 @@
  global $CONFIG, $MESSAGE, $compose_mode;

  // determine whether HTML or plain text should be checked
  $useHtml = $CONFIG['htmleditor'] ? true : false;

  if ($compose_mode)
    $useHtml = ($useHtml && $MESSAGE->has_html_part());
    $useHtml = (($CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
    && $MESSAGE->has_html_part());
  else
    $useHtml = $CONFIG['htmleditor'] ? true : false;

  if (empty($attrib['editorid']))
    $attrib['editorid'] = 'rcmComposeBody';