A menu was being created too early, before it is possible to avoid

creating the menu with an invalid default selection.  This was causing
bugzilla to (incorrectly) spew a database corruption error when
attempting to view a bug that had been resolved MOVED.  Why this
wasn't causing the same problem with DUPLICATE resolutions, I don't
know.  Moved the menu creation later in the code, so that it only
happens after it has been ensured that the default selection is not
going to be MOVED.

diff --git a/bug_form.pl b/bug_form.pl
index c41b51e6eb5ed71d0b8fb304dd69205f36456455..3216ba42fd962e0783a48a9a0a92d7c366de4947 100644 (file)
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -140,8 +140,6 @@ GetVersionTable();
 # These should be read from the database ...
 #
 
-my $resolution_popup = make_options(\@::settable_resolution,
-                                   $bug{'resolution'});
 my $platform_popup = make_options(\@::legal_platform, $bug{'rep_platform'});
 my $priority_popup = make_options(\@::legal_priority, $bug{'priority'});
 my $sev_popup = make_options(\@::legal_severity, $bug{'bug_severity'});
@@ -445,6 +443,8 @@ if ($canedit || $::userid == $assignedtoid ||
             print "<b>$bug{'resolution'}</b>)<br>\n";
             $knum++;
         }
+        my $resolution_popup = make_options(\@::settable_resolution,
+                                            $bug{'resolution'});
         print "<INPUT TYPE=radio NAME=knob VALUE=resolve>
         Resolve bug, changing <A HREF=\"bug_status.html\">resolution</A> to
         <SELECT NAME=resolution