From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 13 May 2010 13:44:19 +0000 (+0200)
Subject: Bug 565314: Cannot edit FIXED bugs when a blocker is open, when "noresolveonopenblock... 
X-Git-Tag: bugzilla-3.7.1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3259eebfeb070e2f67094060d4926e2e1e649a3;p=thirdparty%2Fbugzilla.git

Bug 565314: Cannot edit FIXED bugs when a blocker is open, when "noresolveonopenblockers" is on
r/a=mkanat
---

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 1b7753eff7..9a915b6f8c 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1531,7 +1531,9 @@ sub _check_resolution {
     ThrowUserError('resolution_not_allowed') if $self->status->is_open;
     
     # Check noresolveonopenblockers.
-    if (Bugzilla->params->{"noresolveonopenblockers"} && $resolution eq 'FIXED')
+    if (Bugzilla->params->{"noresolveonopenblockers"}
+        && $resolution eq 'FIXED'
+        && (!$self->resolution || $resolution ne $self->resolution))
     {
         my @dependencies = CountOpenDependencies($self->id);
         if (@dependencies) {