Merge branch 'master' of github.com:roundcube/roundcubemail
| | |
| | | - 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) |
| | |
| | | |
| | | 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) |
| | |
| | | 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 { |