More places to destroy the compose object.

Automatically delete attachments when deleting compose object.

diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php
index 588070a..e22b73a 100644 (file)
--- a/imp/compose-dimp.php
+++ b/imp/compose-dimp.php
@@ -103,6 +103,8 @@ if (count($_POST)) {
                 /* Delete existing draft. */
                 $imp_ui->removeDraft($old_uid);
 
+                $imp_compose->destroy();
+
                 if ($action == 'auto_save_draft') {
                     $notification->push(_("Draft automatically saved."), 'horde.message');
                 } else {
@@ -175,6 +177,8 @@ if (count($_POST)) {
             }
         }
 
+        $imp_compose->destroy();
+
         $res = IMP_Dimp::getFolderResponse($imptree);
         if (!empty($res)) {
             $result->folder = $res['a'][0];

diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php
index d9d6df1..8e5530e 100644 (file)
--- a/imp/compose-mimp.php
+++ b/imp/compose-mimp.php
@@ -286,7 +286,6 @@ case _("Send"):
     break;
 
 case _("Cancel"):
-    $imp_compose->deleteAllAttachments();
     $imp_compose->destroy();
     require IMP_BASE . '/mailbox-mimp.php';
     exit;

diff --git a/imp/compose.php b/imp/compose.php
index f92a816..1dcd29c 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -393,6 +393,7 @@ case 'send_message':
 
     $message = Horde_Util::getFormData('message');
     $header['subject'] = Horde_Util::getFormData('subject', '');
+
     if ($smf = Horde_Util::getFormData('sent_mail_folder')) {
         $sent_mail_folder = $smf;
     }
@@ -509,7 +510,6 @@ case 'fwd_digest':
     break;
 
 case 'cancel_compose':
-    $imp_compose->deleteAllAttachments();
     $imp_compose->destroy();
     if ($isPopup) {
         Horde_Util::closeWindowJS();

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 13ea31a..d8c0692 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -148,6 +148,7 @@ class IMP_Compose
      */
     public function destroy()
     {
+        $this->deleteAllAttachments();
         $obs = Horde_SessionObjects::singleton();
         $obs->prune($this->_cacheid);
     }