summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-19 07:33:32 +0000
committeralecpl <alec@alec.pl>2012-01-19 07:33:32 +0000
commit002189e3ab413b7702f3e0939cab68c9ea10817a (patch)
treecc36a608c94581455e7b5fd5a690c70c2609b216
parentce4c6103114ad45c69ff2a6a06e3b847b64dfc8f (diff)
- Fix drafts update issues when edited from preview pane (#1488314)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/show.inc3
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8b0e0a674..35d13ba31 100644
--- a/CHANGELOG
+++ b/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/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 29fe650a9..d3b70b4ab 100644
--- a/program/steps/mail/show.inc
+++ b/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');