Remove allow_resume_all_in_drafts config option

diff --git a/imp/config/conf.xml b/imp/config/conf.xml
index f1b9fc8..b58fbb7 100644 (file)
--- a/imp/config/conf.xml
+++ b/imp/config/conf.xml
@@ -15,11 +15,6 @@
      choose which folder to save their sent messages to. If this is false, then
      messages will be saved to the folder defined in their
      preferences.">false</configboolean>
-     <configboolean name="allow_resume_all_in_drafts" desc="If this is true, the
-     user will be able to resume any message in their draft mailbox (to
-     compensate for some clients that don't bother setting the draft flag).
-     Otherwise, only messages marked as 'drafts' can be
-     resumed.">false</configboolean>
     </case>
     <case name="false" desc="No" />
    </configswitch>

diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index 02bc05e..751366d 100644 (file)
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -42,6 +42,10 @@ spellchecking, and login redirection have been moved to Horde.
 The 'show_preview' option has been removed; enabling previews is now handled
 by the 'show_preview' preference.
 
+The 'allow_resume_all_in_drafts' option has been removed; all messages that
+appear in the configured Drafts mailbox always are now always allowed to be
+resumed.
+
 The 'css_files' configuration option for the dynamic (dimp) display has been
 removed.  Equivalent behavior can now be found in the Horde-wide 'cssfiles'
 hook.

diff --git a/imp/message.php b/imp/message.php
index 7b6f749..ea76b3e 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -514,10 +514,9 @@ if (!empty($conf['user']['allow_view_source'])) {
 }
 
 if (!$disable_compose &&
-    (!empty($conf['user']['allow_resume_all']) ||
-     (!empty($conf['user']['allow_resume_all_in_drafts']) &&
-      $mailbox_name == IMP::folderPref($prefs->getValue('drafts_folder'), true)) ||
-      in_array('\\draft', $flags))) {
+    (in_array('\\draft', $flags) ||
+     !empty($conf['user']['allow_resume_all']) ||
+     ($mailbox_name == IMP::folderPref($prefs->getValue('drafts_folder'), true)))) {
     $a_template->set('resume', Horde::widget(IMP::composeLink(array(), array('actionID' => 'draft') + $compose_params), _("Resume"), 'widget', '', '', _("Resume"), true));
 }