From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 2 Aug 2010 23:16:05 +0000 (+0200)
Subject: Bug 583287: Some fields should not be displayed in bugmail for new bugs
X-Git-Tag: bugzilla-4.1.1~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ba061b3f6ced9f3b54321160496ac3d94a9a398;p=thirdparty%2Fbugzilla.git

Bug 583287: Some fields should not be displayed in bugmail for new bugs
r/a=mkanat
---

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 3e97b4457b..5688c1e7fb 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 484d6536a0..ee11689361 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},