diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-03-13 22:58:57 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-03-13 23:01:39 +0100 |
| commit | 8d3b27b9e8aff077b15ff33c0e9abaec3cfd9cb2 (patch) | |
| tree | a2eebb08697473f828e1f5e5228de18e8125c6fa /program/steps/mail/func.inc | |
| parent | f4564ae20d3c85b374b1312cb72e794733957968 (diff) | |
Fix message import dialog (#1489685):
- Display alert if no file is chosen
- Unlock the UI if form is not submitted
- Avoid duplicate error messages
- Fix javascript error due to missing attachments list widget
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index aa41d6a0b..072ee716c 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -124,7 +124,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { if (!$OUTPUT->ajax_call) { $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage', - 'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait'); + 'copy', 'move', 'quota', 'replyall', 'replylist'); } $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true); @@ -2070,6 +2070,7 @@ function rcmail_message_import_form($attrib = array()) $content); $RCMAIL->output->add_gui_object('importform', $attrib['id'].'Frm'); + $RCMAIL->output->add_label('selectimportfile','importwait'); return html::div($attrib, $out); } |