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 dedff7175d3b8440f36756402b6abe78bc96e9c7..7f2b8d84b9b5fa5ffd88d450ab8dade25d057d6f 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1872,13 +1872,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) {