Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 7 insertions, 11 deletions

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index eee41d336..3500b9fe4 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -7,18 +7,16 @@ function rcmail_archive(prop)
 {
   if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
     return;
-  
+
   if (rcmail.env.mailbox.indexOf(rcmail.env.archive_folder) != 0) {
     if (!rcmail.env.archive_type) {
       // simply move to archive folder (if no partition type is set)
-      rcmail.command('moveto', rcmail.env.archive_folder);
+      rcmail.command('move', rcmail.env.archive_folder);
     }
     else {
       // let the server sort the messages to the according subfolders
-      rcmail.http_post(
-        'plugin.move2archive',
-        { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox }
-      );
+      var post_data = { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
+      rcmail.http_post('plugin.move2archive', post_data);
     }
   }
 }
@@ -26,16 +24,15 @@ function rcmail_archive(prop)
 // callback for app-onload event
 if (window.rcmail) {
   rcmail.addEventListener('init', function(evt) {
-    
     // register command (directly enable in message view mode)
     rcmail.register_command('plugin.archive', rcmail_archive, (rcmail.env.uid && rcmail.env.mailbox != rcmail.env.archive_folder));
-    
+
     // add event-listener to message list
     if (rcmail.message_list)
-      rcmail.message_list.addEventListener('select', function(list){
+      rcmail.message_list.addEventListener('select', function(list) {
         rcmail.enable_command('plugin.archive', (list.get_selection().length > 0 && rcmail.env.mailbox != rcmail.env.archive_folder));
       });
-    
+
     // set css style for archive folder
     var li;
     if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true)))
@@ -48,4 +45,3 @@ if (window.rcmail) {
     });
   })
 }
-