diff options
| author | mkanat%bugzilla.org <> | 2006-09-22 08:19:03 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2006-09-22 08:19:03 +0200 |
| commit | 6c0f16ffbf7b39da24ded73e17fd2fc0ea4e1a75 (patch) | |
| tree | 01b6bc59ac81cec31c465487b6283645e6567984 /template/en/default | |
| parent | c4840b684916affdf475076faa5ad698d5dc54b5 (diff) | |
| download | bugzilla-6c0f16ffbf7b39da24ded73e17fd2fc0ea4e1a75.tar.gz bugzilla-6c0f16ffbf7b39da24ded73e17fd2fc0ea4e1a75.tar.xz | |
Bug 351994: Messages shouldn't contain HTML characters unless we're in USAGE_MODE_BROWSER
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=ghendricks, a=myk
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/global/message.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 63ce0ffab..f6ccae754 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -434,7 +434,11 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% error_message FILTER none %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] [% RETURN %] [% END %] diff --git a/template/en/default/global/message.txt.tmpl b/template/en/default/global/message.txt.tmpl index fc0ec1977..e8ec1e510 100644 --- a/template/en/default/global/message.txt.tmpl +++ b/template/en/default/global/message.txt.tmpl @@ -23,4 +23,4 @@ [%# Yes, this may show some HTML. But it's the best we # can do at the moment. %] [% PROCESS global/messages.html.tmpl %] -[% message %] +[% message FILTER txt %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index a9706376b..646da5f75 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1483,7 +1483,11 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% error_message FILTER none %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] [% RETURN %] [% END %] |