From 8ba061b3f6ced9f3b54321160496ac3d94a9a398 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 3 Aug 2010 01:16:05 +0200
Subject: Bug 583287: Some fields should not be displayed in bugmail for new
 bugs r/a=mkanat

---
 Bugzilla/BugMail.pm | 4 ++--
 Bugzilla/Field.pm   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 3e97b4457..5688c1e7f 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -408,10 +408,10 @@ sub sendMail {
                 $value = $value->name;
             }
             elsif ($name eq 'estimated_time') {
-                $value = format_time_decimal($value);
+                $value = ($value == 0) ? 0 : format_time_decimal($value);
             }
             elsif ($name eq 'deadline') {
-                $value = time2str("%Y-%m-%d", str2time($value));
+                $value = time2str("%Y-%m-%d", str2time($value)) if $value;
             }
 
             # If there isn't anything to show, don't include this header.
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 484d6536a..ee1168936 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -214,9 +214,9 @@ use constant DEFAULT_FIELDS => (
     {name => 'target_milestone',      desc => 'Target Milestone',
      buglist => 1},
     {name => 'creation_ts',           desc => 'Creation date',
-     in_new_bugmail => 1, buglist => 1},
+     buglist => 1},
     {name => 'delta_ts',              desc => 'Last changed date',
-     in_new_bugmail => 1, buglist => 1},
+     buglist => 1},
     {name => 'longdesc',              desc => 'Comment'},
     {name => 'longdescs.isprivate',   desc => 'Comment is private'},
     {name => 'alias',                 desc => 'Alias', buglist => 1},
-- 
cgit v1.2.3-24-g4f1b