Fix refreshing of drafts list when sending a message which was saved …

…in meantime (#1490238)
roundcube · Feb 15, 2015 · 9ed6d46 · 9ed6d46
1 parent de3fc1a
commit 9ed6d46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix refreshing of drafts list when sending a message which was saved in meantime (#1490238)
+
 RELEASE 1.1.0
 -------------
 - Make SMTP error log more verbose - include server response and error code

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
@@ -684,11 +684,16 @@ if ($savedraft) {
     $OUTPUT->command('auto_save_start');
 }
 else {
+    // Collect folders which could contain the composed message,
+    // we'll refresh the list if currently opened folder is one of them (#1490238)
     $folders = array();
 
     if (in_array($COMPOSE['mode'], array('reply', 'forward', 'draft'))) {
         $folders[] = $COMPOSE['mailbox'];
     }
+    if (!empty($COMPOSE['param']['draft_uid']) && $drafts_mbox) {
+        $folders[] = $drafts_mbox;
+    }
 
     rcmail_compose_cleanup($COMPOSE_ID);
     $OUTPUT->command('remove_compose_data', $COMPOSE_ID);