summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-01 19:10:53 +0000
committeralecpl <alec@alec.pl>2012-01-01 19:10:53 +0000
commitbc8437b71c440a605497a6af363811351b1aa147 (patch)
tree4813da592a308ca98b0500dc149a2c4bb3515b50 /program
parente81c00b7b9d9b8e141dd9642fdcfafe975d7c656 (diff)
- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/compose.inc12
1 files changed, 5 insertions, 7 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 71729602a..d09b92013 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1238,7 +1238,7 @@ function rcmail_compose_attachment_list($attrib)
'title' => rcube_label('delete'),
'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id)),
$button) . Q($a_prop['name']));
-
+
$jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
}
}
@@ -1252,14 +1252,14 @@ function rcmail_compose_attachment_list($attrib)
$OUTPUT->set_env('attachments', $jslist);
$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
-
+
return html::tag('ul', $attrib, $out, html::$common_attrib);
}
function rcmail_compose_attachment_form($attrib)
{
- global $RCMAIL, $OUTPUT;
+ global $OUTPUT;
// add ID if not given
if (!$attrib['id'])
@@ -1300,7 +1300,7 @@ 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']);
@@ -1337,7 +1337,7 @@ function rcmail_receipt_checkbox($attrib)
unset($attrib['form']);
if (!isset($attrib['id']))
- $attrib['id'] = 'receipt';
+ $attrib['id'] = 'receipt';
$attrib['name'] = '_receipt';
$attrib['value'] = '1';
@@ -1380,8 +1380,6 @@ function rcmail_dsn_checkbox($attrib)
function rcmail_editor_selector($attrib)
{
- global $CONFIG, $MESSAGE, $compose_mode;
-
// determine whether HTML or plain text should be checked
$useHtml = rcmail_compose_editor_mode();