summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2009-01-20 21:22:07 +0100
committermkanat%bugzilla.org <>2009-01-20 21:22:07 +0100
commit82c721450888328c7183bc2e4c4e39934194b949 (patch)
tree8a4472057eb520025e0d79029bd7db72d6b7a13b /template
parent8daa29c602f8409beab723c955405a501ab649d3 (diff)
downloadbugzilla-82c721450888328c7183bc2e4c4e39934194b949.tar.gz
bugzilla-82c721450888328c7183bc2e4c4e39934194b949.tar.xz
Bug 470057: Collapse and wrap text messages and text errors
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/sanitycheck/messages.html.tmpl9
-rw-r--r--template/en/default/email/sanitycheck.txt.tmpl2
2 files changed, 8 insertions, 3 deletions
diff --git a/template/en/default/admin/sanitycheck/messages.html.tmpl b/template/en/default/admin/sanitycheck/messages.html.tmpl
index 2847a35e7..b65f8eac5 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 9c1926925..8826d4e39 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 %]