auto_delete_drafts preference is no longer used

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 923e98e..c6ff87e 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -704,8 +704,7 @@ $prefGroups['drafts'] = array(
     'label' => _("Message Drafts"),
     'desc' => _("Configure how to deal with message drafts."),
     'members' => array(
-        'draftsselect', 'close_draft', 'unseen_drafts', 'auto_save_drafts',
-        'auto_delete_drafts'
+        'draftsselect', 'close_draft', 'unseen_drafts', 'auto_save_drafts'
     )
 );
 
@@ -736,13 +735,6 @@ $_prefs['auto_save_drafts'] = array(
     'desc' => _("Save drafts automatically while composing?"),
 );
 
-// delete draft after resume & send?
-$_prefs['auto_delete_drafts'] = array(
-    'value' => 0,
-    'type' => 'checkbox',
-    'desc' => _("Automatically delete draft after successfully resuming and sending message?")
-);
-
 
 
 // *** Message Viewing Preferences ***

diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index 902851c..1f205b4 100644 (file)
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -64,6 +64,7 @@ your ``config/prefs.php`` file and your preferences backend::
 
    alternative_display
    attachment_display
+   auto_delete_drafts
    fckeditor_buttons
    filter_on_sidebar
    forward_bodytext

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index b3f005a..073a463 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -1623,8 +1623,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
         }
 
         /* Remove any auto-saved drafts. */
-        if ($GLOBALS['prefs']->getValue('auto_save_drafts') ||
-            $GLOBALS['prefs']->getValue('auto_delete_drafts')) {
+        if ($GLOBALS['prefs']->getValue('auto_save_drafts')) {
             $result->draft_delete = 1;
         }