From 778b16a9166138bb203a9d9be3f5bd74dd6068e5 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 30 Sep 2010 15:28:41 -0600 Subject: [PATCH] Add IMP_Compose::hasDrafts() --- imp/lib/Ajax/Application.php | 2 +- imp/lib/Compose.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php index 5738c3cc0..85c848fdd 100644 --- 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 0311294fc..89c614328 100644 --- 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. -- 2.11.0