Bug 399075: Remove the 'commentonclearresolution' parameter - Patch by Frédéric...

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 25c2146ef90b769fc48f777551c88212e5ec1ff4..e9e73920a11620054fced70792afaa8b6385cdc7 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -2049,11 +2049,6 @@ sub clear_resolution {
     if (!$self->status->is_open) {
         ThrowUserError('resolution_cant_clear', { bug_id => $self->id });
     }
-    if (Bugzilla->params->{'commentonclearresolution'}
-        && $self->resolution && !$self->{added_comments})
-    {
-        ThrowUserError('comment_required');
-    }
     $self->{'resolution'} = ''; 
     $self->_clear_dup_id; 
 }

diff --git a/Bugzilla/Config/BugChange.pm b/Bugzilla/Config/BugChange.pm
index aec6e2428a37e69befe3c715415dfc555df215dc..00a234a309d6799108bf56971914e04c4127195e 100644 (file)
--- a/Bugzilla/Config/BugChange.pm
+++ b/Bugzilla/Config/BugChange.pm
@@ -80,12 +80,6 @@ sub get_param_list {
    default => 0
   },
 
-  {
-   name => 'commentonclearresolution',
-   type => 'b',
-   default => 0
-  },
-
   {
    name => 'commentonchange_resolution',
    type => 'b',

diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index 458bc4eb8d72421e0aaf132cec34ec0ccbcc59ae..b00fea05e1ee8b928252264cca47751e79f1a86d 100644 (file)
--- a/template/en/default/admin/params/bugchange.html.tmpl
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -40,9 +40,6 @@
   musthavemilestoneonaccept => "If you are using Target Milestone, do you want to require that " _
                                "the milestone be set in order for a user to ACCEPT a ${terms.bug}?",
 
-  commentonclearresolution => "If this option is on, the user needs to enter a short comment if " _
-                              "the ${terms.bug}'s resolution is cleared.",
-
   commentonchange_resolution => "If this option is on, the user needs to enter a short " _
                                 "comment if the resolution of the $terms.bug changes.",