Bug 470057: Collapse and wrap text messages and text errors

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 3141c8a4cded1c5697c82f7a59124b8b26550fc6..e5fecbe0d89a08d7ebc44161e83a4f12d2097640 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/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;
             },
 

diff --git a/template/en/default/admin/sanitycheck/messages.html.tmpl b/template/en/default/admin/sanitycheck/messages.html.tmpl
index 2847a35e761ffe137c43cfa0aaffaf27aac2e8f8..b65f8eac545322d9fc098be5969fc42b2546fcd7 100644 (file)
--- a/template/en/default/admin/sanitycheck/messages.html.tmpl
+++ b/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 %]

diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl
index 9c19269257181d61d0d32e91c156b2f0f4b627da..8826d4e3955a5c0f4bb350fcfd52ab6e87c1d61b 100644 (file)
--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/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 %]