Bug 470057: Collapse and wrap text messages and text errors

Bugzilla/Template.pm

@@ -698,6 +698,10 @@ sub create {
                 $var =~ s/\>/>/g;
                 $var =~ s/\"/\"/g;
                 $var =~ s/\&/\&/g;
+                # Now remove extra whitespace, and wrap it to 72 characters.
+                my $collapse_filter = $Template::Filters::FILTERS->{collapse};
+                $var = $collapse_filter->($var);
+                $var = wrap_comment($var, 72);
                 return $var;
             },
 

template/en/default/admin/sanitycheck/messages.html.tmpl

@@ -310,8 +310,13 @@
   [% END %]
 [% END %]
 
-[% san_message FILTER html %]
-
+[% USE Bugzilla %]
+[% IF Bugzilla.usage_mode == constants.USAGE_MODE_CMDLINE %]
+  [% san_message FILTER none %]
+[% ELSE %]
+  [%# Avoid the txt filter in message.txt.tmpl. %]
+  [% san_message FILTER html %]
+[% END %]
 
 [% BLOCK bug_list %]
   [% FOREACH bug_id = badbugs %]

template/en/default/email/sanitycheck.txt.tmpl

@@ -33,4 +33,4 @@ Some errors have been found.
 No errors have been found.
 [% END %]
 
-[% output FILTER txt %]
+[% output %]