diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-10 10:49:41 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-10 10:49:41 +0200 |
| commit | 6b6d49313d6ccae2ce82145d8df3fe6840b7ed20 (patch) | |
| tree | cce879f3cbf8338e2e917bbe55bcdaea08ca49b7 | |
| parent | 8d34b9dce335883c0190e9e98232ce7b48a7b9c5 (diff) | |
| parent | 8c45290cab824dc9257dab948f1a70a3556b0040 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail - 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 7f19382e0..5fe58702d 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6861,7 +6861,7 @@ function rcube_webmail() 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 22ebaed8d..2b717d673 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -487,7 +487,7 @@ function rcmail_process_compose_params(&$COMPOSE) 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 { |