From aa30cf8f3c05ab4fd69f7ab2dea39e56d8bf1976 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 26 Mar 2013 19:06:11 +0100
Subject: Better fix for "saving draft just after entering compose window
 (#1489012)"

---
 program/js/app.js              | 4 ++--
 program/steps/mail/compose.inc | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'program')

diff --git a/program/js/app.js b/program/js/app.js
index 87cdf3b3d..eb8644a5b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -950,7 +950,7 @@ function rcube_webmail()
         clearTimeout(this.save_timer);
 
         // compose form did not change (and draft wasn't saved already)
-        if (this.draft_saved && this.cmp_hash == this.compose_field_hash()) {
+        if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
           this.auto_save_start();
           break;
         }
@@ -3345,7 +3345,7 @@ function rcube_webmail()
 
   this.set_draft_id = function(id)
   {
-    this.draft_saved = id;
+    this.env.draft_id = id;
     $("input[name='_draft_saveid']").val(id);
   };
 
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index c339fb444..a39642206 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -152,6 +152,7 @@ if ($font && !is_array($font)) {
 // get reference message and set compose mode
 if ($msg_uid = $COMPOSE['param']['draft_uid']) {
   $compose_mode = RCUBE_COMPOSE_DRAFT;
+  $OUTPUT->set_env('draft_id', $msg_uid);
   $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
 }
 else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
-- 
cgit v1.2.3