summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-19 07:33:32 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-19 07:33:32 +0000
commitbc333b335dad1454d2d2728b2a3a10464483516e (patch)
tree315b9d90365ac3f266612393d006e7d6084e4be0
parent6dadf9c23e84b14ac5e73df6e94d4b4bdbc9dacb (diff)
- Fix drafts update issues when edited from preview pane (#1488314)
git-svn-id: https://svn.roundcube.net/trunk@5802 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/steps/mail/show.inc3
2 files changed, 4 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 8b0e0a674..35d13ba31 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix drafts update issues when edited from preview pane (#1488314)
- Changed license to GNU GPLv3+ with exceptions for skins & plugins
- Make mime type detection based on filename extension to be case-insensitive
- Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc
index 29fe650a9..d3b70b4ab 100644
--- a/roundcubemail/program/steps/mail/show.inc
+++ b/roundcubemail/program/steps/mail/show.inc
@@ -52,6 +52,9 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
$OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
$OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
$OUTPUT->set_env('mailbox', $mbox_name);
+ if ($CONFIG['drafts_mbox']) {
+ $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
+ }
// mimetypes supported by the browser (default settings)
$mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/x-javascript,application/pdf,application/x-shockwave-flash');