Merge branch 'master' of github.com:roundcube/roundcubemail

pull/176/head
Aleksander Machniak 11 years ago
commit 6b6d49313d

@ -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)

@ -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)

@ -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 {

Loading…
Cancel
Save