aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyeh%bluemartini.com <>2001-03-10 07:41:37 +0000
committercyeh%bluemartini.com <>2001-03-10 07:41:37 +0000
commita0b4765775200003bb118b719402f7290f9f2588 (patch)
tree7c8937caf9bf5076fe9a90fe1e7291281a731c05 /process_bug.cgi
parentFix for bug 71510: permissions not set correctly on graphs directory (diff)
downloadbugzilla-a0b4765775200003bb118b719402f7290f9f2588.tar.gz
bugzilla-a0b4765775200003bb118b719402f7290f9f2588.tar.bz2
bugzilla-a0b4765775200003bb118b719402f7290f9f2588.zip
fix for 70039: Mid-air collision page confusing, users think comments will be lost
Diffstat (limited to 'process_bug.cgi')
-rwxr-xr-xprocess_bug.cgi6
1 files changed, 2 insertions, 4 deletions
diff --git a/process_bug.cgi b/process_bug.cgi
index 061dadc93..e209dd5eb 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -727,11 +727,9 @@ The changes made were:
my $value = value_quote($::FORM{$i});
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 " This will cause all of the above changes to be overwritten";
- if ($longchanged) {
- print ", except for the changes to the description";
- }
+ 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);
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();
exit;