From 574f416076d5ea65f8720d4680135c4f50d19f29 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 3 Sep 2014 11:24:15 +0200 Subject: Fix merging folder annotations for folders with numeric names (only digits) --- program/lib/Roundcube/rcube_imap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index 83fdab9e2..c30abc0f3 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -3682,7 +3682,9 @@ class rcube_imap extends rcube_storage // @TODO: Honor MAXSIZE and DEPTH options foreach ($queries as $attrib => $entry) { if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) { - $res = array_merge_recursive($res, $result); + foreach ($result as $folder => $data) { + $res[$folder] = array_merge((array) $res[$folder], $data); + } } } } -- cgit v1.2.3 From 25207f5a650ab29e0a7b667d61a721e7e6e1f8b8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 4 Sep 2014 13:26:10 +0200 Subject: Fix error in MSSQL update script 2013061000.sql (#1490061) --- CHANGELOG | 1 + SQL/mssql/2013061000.sql | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index daa2b7fe0..996a9f062 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail - Fix contacts list update after adding/deleting/moving a contact (#1490028, #1490033) - Fix handling of email addresses with quoted domain part (#1490040) - Fix comm_path update on task switch (#1490041) +- Fix error in MSSQL update script 2013061000.sql (#1490061) RELEASE 1.0.2 ------------- diff --git a/SQL/mssql/2013061000.sql b/SQL/mssql/2013061000.sql index 55b5ec3a5..5e8b791f1 100644 --- a/SQL/mssql/2013061000.sql +++ b/SQL/mssql/2013061000.sql @@ -1,12 +1,12 @@ -ALTER TABLE [dbo].[cache] ADD COLUMN [expires] [datetime] NULL +ALTER TABLE [dbo].[cache] ADD [expires] [datetime] NULL GO -ALTER TABLE [dbo].[cache_shared] ADD COLUMN [expires] [datetime] NULL +ALTER TABLE [dbo].[cache_shared] ADD [expires] [datetime] NULL GO -ALTER TABLE [dbo].[cache_index] ADD COLUMN [expires] [datetime] NULL +ALTER TABLE [dbo].[cache_index] ADD [expires] [datetime] NULL GO -ALTER TABLE [dbo].[cache_thread] ADD COLUMN [expires] [datetime] NULL +ALTER TABLE [dbo].[cache_thread] ADD [expires] [datetime] NULL GO -ALTER TABLE [dbo].[cache_messages] ADD COLUMN [expires] [datetime] NULL +ALTER TABLE [dbo].[cache_messages] ADD [expires] [datetime] NULL GO UPDATE [dbo].[cache] SET [expires] = DATEADD(second, 604800, [created]) -- cgit v1.2.3