From 871a26d3285f771279e2efb0ea96baf88b952213 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 08 Sep 2014 14:25:14 -0400
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_imap.php | 4 +++-
SQL/mssql/2013061000.sql | 10 +++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index daa2b7f..996a9f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
- 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 55b5ec3..5e8b791 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])
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index dd5fbe4..01059aa 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -3682,7 +3682,9 @@
// @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);
+ }
}
}
}
--
Gitblit v1.9.1