summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-19 07:32:08 +0000
committeralecpl <alec@alec.pl>2012-01-19 07:32:08 +0000
commit68d3aada14af4a17ec1f345713d75ab0b4343be8 (patch)
treed6a2d4a49af4481b0546fcf842f58a0f858c6c9e
parent9ac31a6123b07818448a0927c3b1bfe11c46ed09 (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 44b78af6c..386ed97c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix drafts update issues when edited from preview pane (#1488314)
- Fix wrong variable name in rcube_ldap.php (#1488302)
- 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 d928cfd68..eeafabdeb 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -49,6 +49,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', $IMAP->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');