From 6b6d49313d6ccae2ce82145d8df3fe6840b7ed20 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Apr 2014 04:49:41 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
CHANGELOG | 1 +
program/steps/mail/compose.inc | 2 +-
program/js/app.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d33e545..8e48d82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- Search across multiple folders (#1485234)
- Improve UI integration of ACL settings
- Drop support for PHP < 5.3.7
+- Apply user-specific replacements to group's base_dn property (#1489779)
- Set In-Reply-To and References for forwarded messages (#1489593)
- Removed redundant default_folders config option (#1489737)
- Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830)
diff --git a/program/js/app.js b/program/js/app.js
index 7f19382..5fe5870 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6861,7 +6861,7 @@
this.goto_url = function(action, query, lock)
{
- this.redirect(this.url(action, query));
+ this.redirect(this.url(action, query), lock);
};
this.location_href = function(url, target, frame)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 22ebaed..2b717d6 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -487,7 +487,7 @@
foreach ($plugin['attachments'] as $attach) {
// we have structured data
if (is_array($attach)) {
- $attachment = $attach;
+ $attachment = $attach + array('group' => $COMPOSE_ID);
}
// only a file path is given
else {
--
Gitblit v1.9.1