diff options
Diffstat (limited to 'program/steps/mail/compose.inc')
| -rw-r--r-- | program/steps/mail/compose.inc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 878cf8634..0ee55f8a9 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -426,8 +426,7 @@ function rcmail_compose_body($attrib) $out .= $msgtype->show(); // If desired, set this text area to be editable by TinyMCE - if ($isHtml) - $attrib['mce_editable'] = "true"; + if ($isHtml) $attrib['class'] = "mce_editor"; $textarea = new html_textarea($attrib); $out .= $textarea->show($body); $out .= $form_end ? "\n$form_end" : ''; @@ -799,9 +798,13 @@ function rcmail_editor_selector($attrib) // determine whether HTML or plain text should be checked if ($CONFIG['htmleditor']) + { $useHtml = true; + } else + { $useHtml = false; + } if ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD || @@ -811,23 +814,19 @@ function rcmail_editor_selector($attrib) $useHtml = ($hasHtml && $CONFIG['htmleditor']); } + $chosenvalue = $useHtml ? 'html' : 'plain'; + $selector = ''; $attrib['name'] = '_editorSelect'; $attrib['onchange'] = 'return rcmail_toggle_editor(this)'; foreach ($choices as $value => $text) { - $checked = ''; - if ((($value == 'html') && $useHtml) || - (($value != 'html') && !$useHtml)) - $attrib['checked'] = 'true'; - else - unset($attrib['checked']); - $attrib['id'] = '_' . $value; + $attrib['value'] = $value; $rb = new html_radiobutton($attrib); $selector .= sprintf("%s<label for=\"%s\">%s</label>", - $rb->show($value), + $rb->show($chosenvalue), $attrib['id'], rcube_label($text)); } @@ -923,4 +922,4 @@ if ($a_contacts) $OUTPUT->set_env('contacts', $a_contacts); } $OUTPUT->send('compose'); -?>
\ No newline at end of file +?> |