From 6c604de4e442ea6fb716e6ca322a49773e795a74 Mon Sep 17 00:00:00 2001
From: "terry%mozilla.org" <>
Date: Sun, 23 Jan 2000 05:43:29 +0000
Subject: AACK!  checksetup.pl was stomping all over the new fielddefs table if
 it got run more than once.  This checkin fixes that, and also changes the
 DumpBugActivity() routine to give me enough information to hopefully repair
 the damaged mozilla.org database...

---
 CGI.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'CGI.pl')

diff --git a/CGI.pl b/CGI.pl
index 4ad0064f3..8770da748 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -778,12 +778,14 @@ sub DumpBugActivity {
         $datepart = "and bugs_activity.bug_when >= $starttime";
     }
     my $query = "
-        SELECT fielddefs.name, bugs_activity.bug_when,
+        SELECT IFNULL(fielddefs.name, bugs_activity.fieldid),
+                bugs_activity.bug_when,
                 bugs_activity.oldvalue, bugs_activity.newvalue,
                 profiles.login_name
-        FROM bugs_activity,profiles,fielddefs
+        FROM bugs_activity LEFT JOIN fielddefs ON 
+                                     bugs_activity.fieldid = fielddefs.fieldid,
+             profiles
         WHERE bugs_activity.bug_id = $id $datepart
-              AND fielddefs.fieldid = bugs_activity.fieldid
               AND profiles.userid = bugs_activity.who
         ORDER BY bugs_activity.bug_when";
 
-- 
cgit v1.2.3-24-g4f1b