Fix for bug 122897: Comments entered on the bug form are now added to the bug before...

to another Bugzilla install.
Patch by Dave Miller <justdave@syndicomm.com>
r= timeless, bbaetz

diff --git a/move.pl b/move.pl
index e82678d44cb33776dba47fc9ef9121c7c98edca8..36b83a5fa272fdb374a77b6f0f70383ef67f98c6 100755 (executable)
--- a/move.pl
+++ b/move.pl
@@ -121,7 +121,11 @@ foreach my $id (split(/:/, $::FORM{'buglist'})) {
     SendSQL("UPDATE bugs SET bug_status =\"RESOLVED\" where bug_id=\"$id\"");
     SendSQL("UPDATE bugs SET resolution =\"MOVED\" where bug_id=\"$id\"");
 
-    my $comment = "Bug moved to " . Param("move-to-url") . ".\n\n";
+    my $comment = "";
+    if (defined $::FORM{'comment'} && $::FORM{'comment'} !~ /^\s*$/) {
+        $comment .= $::FORM{'comment'} . "\n\n";
+    }
+    $comment .= "Bug moved to " . Param("move-to-url") . ".\n\n";
     $comment .= "If the move succeeded, $exporter will receive a mail\n";
     $comment .= "containing the number of the new bug in the other database.\n";
     $comment .= "If all went well,  please mark this bug verified, and paste\n";