From 4ae991868f79afa0940d7fdb2a5364dc9829735e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 28 Jul 2009 14:39:06 -0600 Subject: [PATCH] Don't delete non-existent draft --- imp/ajax.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imp/ajax.php b/imp/ajax.php index 610c61f73..e85629f5e 100644 --- a/imp/ajax.php +++ b/imp/ajax.php @@ -548,9 +548,10 @@ case 'CancelCompose': case 'DeleteDraft': $imp_compose = IMP_Compose::singleton(Horde_Util::getPost('imp_compose')); $imp_compose->destroy(); - if ($action == 'DeleteDraft') { + $draft_index = $imp_compose->getMetadata('draft_index'); + if ($draft_index && ($action == 'DeleteDraft')) { $imp_message = IMP_Message::singleton(); - $idx_array = array($imp_compose->getMetadata('draft_index') . IMP::IDX_SEP . IMP::folderPref($prefs->getValue('drafts_folder'), true)); + $idx_array = array($draft_index . IMP::IDX_SEP . IMP::folderPref($prefs->getValue('drafts_folder'), true)); $imp_message->delete($idx_array, array('nuke' => true)); } $result = true; -- 2.11.0