summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Bug.pm5
-rw-r--r--Bugzilla/Config/BugChange.pm6
-rw-r--r--template/en/default/admin/params/bugchange.html.tmpl3
3 files changed, 0 insertions, 14 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 25c2146ef..e9e73920a 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 aec6e2428..00a234a30 100644
--- a/Bugzilla/Config/BugChange.pm
+++ b/Bugzilla/Config/BugChange.pm
@@ -81,12 +81,6 @@ sub get_param_list {
},
{
- name => 'commentonclearresolution',
- type => 'b',
- default => 0
- },
-
- {
name => 'commentonchange_resolution',
type => 'b',
default => 0
diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index 458bc4eb8..b00fea05e 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.",