From 55de41cf4acb5fcc3a981f8b3c2777323a8f5359 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 10 Dec 2008 18:35:59 +0000
Subject: [PATCH] =?utf8?q?Bug=20399075:=20Remove=20the=20'commentonclearre?=
 =?utf8?q?solution'=20parameter=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83?=
 =?utf8?q?=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r/a=3Dmkanat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Bug.pm                                      | 5 -----
 Bugzilla/Config/BugChange.pm                         | 6 ------
 template/en/default/admin/params/bugchange.html.tmpl | 3 ---
 3 files changed, 14 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 25c2146ef9..e9e73920a1 100644
--- 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 aec6e2428a..00a234a309 100644
--- 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 458bc4eb8d..b00fea05e1 100644
--- 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.",
 
-- 
2.47.2