From: mkanat%bugzilla.org <>
Date: Tue, 20 Jan 2009 20:22:07 +0000 (+0000)
Subject: Bug 470057: Collapse and wrap text messages and text errors
X-Git-Tag: bugzilla-3.3.2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c721450888328c7183bc2e4c4e39934194b949;p=thirdparty%2Fbugzilla.git

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 3141c8a4cd..e5fecbe0d8 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -698,6 +698,10 @@ sub create {
                 $var =~ s/\&gt;/>/g;
                 $var =~ s/\&quot;/\"/g;
                 $var =~ s/\&amp;/\&/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 2847a35e76..b65f8eac54 100644
--- 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 9c19269257..8826d4e395 100644
--- 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 %]