summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-09-06 03:54:05 +0200
committermkanat%bugzilla.org <>2006-09-06 03:54:05 +0200
commit971d73458f19eb7d1a3600ee7bfd11b16cbc698a (patch)
treef820db2b83adbe975dfa9b15b53067ce6fec29df /template
parent7c689d36de8bff9692abf67b2cfb0cacdca85016 (diff)
downloadbugzilla-971d73458f19eb7d1a3600ee7bfd11b16cbc698a.tar.gz
bugzilla-971d73458f19eb7d1a3600ee7bfd11b16cbc698a.tar.xz
Bug 349764: Errors print out a whole HTML page, even when we're not in USAGE_MODE_BROWSER
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=kevin.benton, a=myk
Diffstat (limited to 'template')
-rw-r--r--template/en/default/global/code-error.html.tmpl6
-rw-r--r--template/en/default/global/user-error.html.tmpl6
2 files changed, 4 insertions, 8 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index d5c5766b0..27798491b 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -393,11 +393,9 @@
[% END %]
[% END %]
-[%# If we are in ERROR_MODE_DIE, we want the error message to be plain text,
- # not HTML
-%]
+[%# We only want HTML error messages for ERROR_MODE_WEBPAGE %]
[% USE Bugzilla %]
-[% IF Bugzilla.error_mode == ERROR_MODE_DIE %]
+[% IF Bugzilla.error_mode != ERROR_MODE_WEBPAGE %]
[% error_message FILTER none %]
[% RETURN %]
[% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c696989f2..7885abd38 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1475,11 +1475,9 @@
[% END %]
[% END %]
-[%# If we are in ERROR_MODE_DIE, we want the error message to be plain text,
- # not HTML
-%]
+[%# We only want HTML error messages for ERROR_MODE_WEBPAGE %]
[% USE Bugzilla %]
-[% IF Bugzilla.error_mode == ERROR_MODE_DIE %]
+[% IF Bugzilla.error_mode != ERROR_MODE_WEBPAGE %]
[% error_message FILTER none %]
[% RETURN %]
[% END %]