summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjake%acutex.net <>2001-11-28 00:04:52 +0100
committerjake%acutex.net <>2001-11-28 00:04:52 +0100
commit8ea8a884620e83074bd9110c8c6813d60109255b (patch)
tree64baaed372999c787dbb91928e23c79b0e932176
parent18b6bbbf06b7ce935edb5d0f4ce8237408fe399b (diff)
downloadbugzilla-8ea8a884620e83074bd9110c8c6813d60109255b.tar.gz
bugzilla-8ea8a884620e83074bd9110c8c6813d60109255b.tar.xz
Bug 108312 - The mid-air collision page was only showing the most recent changes if two people comitted changes to a bug while you were viewing it.
r=louie, myk
-rw-r--r--CGI.pl2
-rwxr-xr-xprocess_bug.cgi2
2 files changed, 2 insertions, 2 deletions
diff --git a/CGI.pl b/CGI.pl
index da06191e4..5a2b5f7ce 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -1216,7 +1216,7 @@ sub DumpBugActivity {
die "Invalid id: $id" unless $id=~/^\s*\d+\s*$/;
if (defined $starttime) {
- $datepart = "and bugs_activity.bug_when >= $starttime";
+ $datepart = "and bugs_activity.bug_when > " . SqlQuote($starttime);
}
my $query = "
SELECT IFNULL(fielddefs.description, bugs_activity.fieldid),
diff --git a/process_bug.cgi b/process_bug.cgi
index 9e90827f1..603fc9c97 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -979,7 +979,7 @@ Someone else has made changes to this bug at the same time you were trying to.
The changes made were:
<p>
";
- DumpBugActivity($id, $delta_ts);
+ DumpBugActivity($id, $::FORM{'delta_ts'});
my $longdesc = GetLongDescriptionAsHTML($id);
my $longchanged = 0;