Commit a0b47657 authored by cyeh%bluemartini.com's avatar cyeh%bluemartini.com

fix for 70039: Mid-air collision page confusing, users think comments will be lost

parent 02b31fdc
...@@ -727,11 +727,9 @@ The changes made were: ...@@ -727,11 +727,9 @@ The changes made were:
my $value = value_quote($::FORM{$i}); my $value = value_quote($::FORM{$i});
print qq{<input type=hidden name="$i" value="$value">\n}; print qq{<input type=hidden name="$i" value="$value">\n};
} }
my $conflictid = DBID_to_name($id);
print qq{<input type=submit value="Submit my changes anyway">\n}; print qq{<input type=submit value="Submit my changes anyway">\n};
print " This will cause all of the above changes to be overwritten"; print "<BR>Clicking this button will preserve " . DBID_to_name($id) . "'s additional comments, but will overwite any other changes made by " . DBID_to_name($id);
if ($longchanged) {
print ", except for the changes to the description";
}
print qq{.</form>\n<li><a href="show_bug.cgi?id=$id">Throw away my changes, and go revisit bug $id</a></ul>\n}; print qq{.</form>\n<li><a href="show_bug.cgi?id=$id">Throw away my changes, and go revisit bug $id</a></ul>\n};
PutFooter(); PutFooter();
exit; exit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment