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 b2482858a8cc65b7637e2f140d205d9de88957de..26b67a3cc56caf6cf7481150ba7622cfcfb0213f 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/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/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 26025015ab34a739ecfe19ba49f750b4b077a985..65c1cec588bb53a004532fbd1f84d06ce2f04fe2 100644 (file)
--- 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},