Bug 465606: If a user doesn't have privs to change the target milestone, it gets...

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index d57c0a802a5629c2c1dfe68b713f4e2df3443649..25c2146ef90b769fc48f777551c88212e5ec1ff4 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1953,13 +1953,13 @@ sub set_product {
         # just die if any of these are invalid.
         $self->set_component($comp_name);
         $self->set_version($vers_name);
-        if ($self->check_can_change_field('target_milestone', 0, 1)) {
-            $self->set_target_milestone($tm_name);
-        }
-        else {
+        if ($product_changed && !$self->check_can_change_field('target_milestone', 0, 1)) {
             # Have to set this directly to bypass the validators.
             $self->{target_milestone} = $product->default_milestone;
         }
+        else {
+            $self->set_target_milestone($tm_name);
+        }
     }
     
     if ($product_changed) {