diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index d2e612ac3..1a464a93f 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -636,7 +636,7 @@ sub sendMail for my $change (@$diffs) { my $field = Bugzilla->get_field($change->{'fieldname'}); - if (($change->{'fieldname'} eq 'longdesc') || ($field->{'type'} eq FIELD_TYPE_TEXTAREA)) + if (0 && ($change->{'fieldname'} eq 'longdesc' || $field->{'type'} eq FIELD_TYPE_TEXTAREA)) { my $diff = new Bugzilla::Diff($change->{'removed'}, $change->{'added'}); $change->{'both'} = $diff->get_table; diff --git a/show_activity.cgi b/show_activity.cgi index e5d80f842..96f7ada24 100755 --- a/show_activity.cgi +++ b/show_activity.cgi @@ -66,7 +66,7 @@ for (my $i = 0; $i < (scalar @$operations); $i++) { my $change = $operations->[$i]->{'changes'}->[$j]; my $field = Bugzilla->get_field($change->{'fieldname'}); - if (($change->{'fieldname'} eq 'longdesc') || ($field->{'type'} eq FIELD_TYPE_TEXTAREA)) + if (0 && ($change->{'fieldname'} eq 'longdesc' || $field->{'type'} eq FIELD_TYPE_TEXTAREA)) { my $diff = new Bugzilla::Diff($change->{'removed'}, $change->{'added'}); $operations->[$i]->{'changes'}->[$j]->{'both'} = $diff->get_table; diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index be35fa155..6d8e6613e 100644 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ b/template/en/default/email/newchangedmail.txt.tmpl @@ -227,7 +227,7 @@ body { font-family: Segoe UI, sans-serif; } [% d.fielddesc %] [% END %] - [% IF d.both %][% d.both %][% else %][% d.removed %][% d.added %][% END %] + [% IF d.both %][% d.both %][% ELSE %][% d.removed %][% d.added %][% END %] [% END %]