From: cyeh%bluemartini.com <>
Date: Sat, 10 Mar 2001 07:41:37 +0000 (+0000)
Subject: fix for 70039: Mid-air collision page confusing, users think comments will be lost
X-Git-Tag: bugzilla-2.12~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0b4765775200003bb118b719402f7290f9f2588;p=thirdparty%2Fbugzilla.git

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

diff --git a/process_bug.cgi b/process_bug.cgi
index 061dadc93b..e209dd5ebd 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;