From 76c3a58cd5e5f040c09258b98727c42f7059a78d Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <>
Date: Fri, 6 Jan 2006 22:38:35 +0000
Subject: Backing out fix for bug 287325 (initial implementation of custom
 fields): turns out the tree is not yet open for 2.24 checkins after all. 
 I'll check this back in once the tree opens for 2.24 checkins, which lpsolit
 says will be in about a month.

---
 Bugzilla/Bug.pm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'Bugzilla/Bug.pm')

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index cfa5f49f6..61798f7cb 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -90,8 +90,6 @@ sub fields {
         push @fields, qw(estimated_time remaining_time actual_time deadline);
     }
 
-    push(@fields, Bugzilla->custom_field_names);
-
     return @fields;
 }
 
@@ -164,11 +162,6 @@ sub initBug  {
 
   $self->{'who'} = new Bugzilla::User($user_id);
 
-    my $custom_fields = "";
-    if (length(Bugzilla->custom_field_names) > 0) {
-        $custom_fields = ", " . join(", ", Bugzilla->custom_field_names);
-    }
-
   my $query = "
     SELECT
       bugs.bug_id, alias, products.classification_id, classifications.name,
@@ -182,8 +175,7 @@ sub initBug  {
       delta_ts, COALESCE(SUM(votes.vote_count), 0),
       reporter_accessible, cclist_accessible,
       estimated_time, remaining_time, " .
-      $dbh->sql_date_format('deadline', '%Y-%m-%d') .
-      $custom_fields . "
+      $dbh->sql_date_format('deadline', '%Y-%m-%d') . "
     FROM bugs
        LEFT JOIN votes
               ON bugs.bug_id = votes.bug_id
@@ -220,8 +212,7 @@ sub initBug  {
                        "target_milestone", "qa_contact_id", "status_whiteboard",
                        "creation_ts", "delta_ts", "votes",
                        "reporter_accessible", "cclist_accessible",
-                       "estimated_time", "remaining_time", "deadline",
-                       Bugzilla->custom_field_names)
+                       "estimated_time", "remaining_time", "deadline")
       {
         $fields{$field} = shift @row;
         if (defined $fields{$field}) {
-- 
cgit v1.2.3-24-g4f1b