From 79ec29975ac8d1a4f49b83ed404a1ee04c33b73c Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Mon, 30 Mar 2015 18:53:57 +0100 Subject: Bug 1007605 - Make FIXED non-fixed, by changing noresolveonopenblockers to define what the fixed resolution is. r,a=glob --- Bugzilla/Bug.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Bugzilla/Bug.pm') diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 2bd6fb646..fc5dbc678 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1937,11 +1937,12 @@ sub _check_resolution { # Don't allow open bugs to have resolutions. ThrowUserError('resolution_not_allowed') if $is_open; - # Check noresolveonopenblockers. + # Check if resolution_forbidden_with_open_blockers. my $dependson = ref($invocant) ? $invocant->dependson : ($params->{dependson} || []); - if (Bugzilla->params->{"noresolveonopenblockers"} - && $resolution eq 'FIXED' + if (Bugzilla->params->{"resolution_forbidden_with_open_blockers"} + && $resolution eq + Bugzilla->params->{"resolution_forbidden_with_open_blockers"} && (!ref $invocant or !$invocant->resolution or $resolution ne $invocant->resolution) && scalar @$dependson) -- cgit v1.2.3-24-g4f1b