summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6dc891549..8513bb0cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix expanding folders during drag&drop (#1488260)
- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
- Add option to set default font for HTML message (#1484137)
- Fix issues with big memory allocation of IMAP results
diff --git a/program/js/app.js b/program/js/app.js
index 7753a4101..1c24add46 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1364,7 +1364,7 @@ function rcube_webmail()
if (this.folder_auto_timer)
window.clearTimeout(this.folder_auto_timer);
- this.folder_auto_expand = k;
+ this.folder_auto_expand = this.env.mailboxes[k].id;
this.folder_auto_timer = window.setTimeout(function() {
rcmail.command('collapse-folder', rcmail.folder_auto_expand);
rcmail.drag_start(null);