Add IMP_Compose::hasDrafts()

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index 5738c3c..85c848f 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -1641,7 +1641,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
         }
 
         /* Remove any auto-saved drafts. */
-        if ($GLOBALS['prefs']->getValue('auto_save_drafts')) {
+        if ($imp_compose->hasDrafts()) {
             $result->draft_delete = 1;
         }
 

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 0311294..89c6143 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -450,6 +450,17 @@ class IMP_Compose
     }
 
     /**
+     * Does this message have any drafts associated with it?
+     *
+     * @return boolean  True if draft messages exist.
+     */
+    public function hasDrafts()
+    {
+        return (!empty($this->_metadata['draft_uid']) ||
+                !empty($this->_metadata['draft_uid_resume']));
+    }
+
+    /**
      * Builds and sends a MIME message.
      *
      * @param string $body     The message body.