From 7a4bc2c460bb593025f6eb5c8dff4e73f197d155 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 2 Aug 2010 23:21:13 +0000
Subject: [PATCH] Bug 583287: Some fields should not be displayed in bugmail
 for new bugs r/a=mkanat

git-svn-id: svn://10.0.0.236/branches/BUGZILLA-4_0-BRANCH@260943 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev             | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugMail.pm | 4 ++--
 mozilla/webtools/bugzilla/Bugzilla/Field.pm   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 3054076903c..1de9d48e303 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7361
\ No newline at end of file
+7362
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
index b2482858a8c..26b67a3cc56 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
@@ -525,10 +525,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/mozilla/webtools/bugzilla/Bugzilla/Field.pm b/mozilla/webtools/bugzilla/Bugzilla/Field.pm
index 26025015ab3..65c1cec588b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Field.pm
+++ b/mozilla/webtools/bugzilla/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},