From 8d3b27b9e8aff077b15ff33c0e9abaec3cfd9cb2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 13 Mar 2014 18:01:39 -0400
Subject: [PATCH] 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

---
 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 aa41d6a..072ee71 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -124,7 +124,7 @@
     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 @@
         $content);
 
     $RCMAIL->output->add_gui_object('importform', $attrib['id'].'Frm');
+    $RCMAIL->output->add_label('selectimportfile','importwait');
 
     return html::div($attrib, $out);
 }

--
Gitblit v1.9.1