From 89dc8499c3e51d426f685ff70e4e878d992ad2c7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 19 Dec 2011 02:42:10 -0500
Subject: [PATCH] - Applied fixes from trunk up to r5628
---
CHANGELOG | 2 ++
SQL/postgres.update.sql | 2 +-
program/js/app.js | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ca22592..6265ee4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix expanding folders during drag&drop (#1488260)
+- Fix wrong postgres sequence name in upgrade from 0.6
- Fix broken CREATE INDEX queries in SQLite DDL files (#1488255)
RELEASE 0.7
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index c96669d..0db2e9e 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -127,7 +127,7 @@
CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
);
-DROP SEQUENCE messages_ids;
+DROP SEQUENCE message_ids;
DROP TABLE messages;
CREATE TABLE cache_index (
diff --git a/program/js/app.js b/program/js/app.js
index 76ea145..e1c4362 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1360,7 +1360,7 @@
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);
--
Gitblit v1.9.1