summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-09 21:56:56 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-09 21:56:56 +0100
commit5bb3d3fb55bc19823a55c0e48322021a5c556394 (patch)
tree41b8a33080ead49f6632f4c8c5c71c017f9df757 /template/en/default/global
parent0c449e2d96804f6e48d3812b42ccf407fbbeb747 (diff)
parented87a68c9fa5c099c79f45bb6f3ab95e42f14002 (diff)
downloadbugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.gz
bugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.xz
merge with bugzilla/4.2
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/code-error.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 70a345984..5dce16976 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -46,7 +46,7 @@
A legal address must contain exactly one '@',
and at least one '.' after the @.
[% ELSE %]
- [%+ Param('emailregexpdesc') %]
+ [%+ Param('emailregexpdesc') FILTER html_light %]
[% END %]
It must also not contain any of these special characters:
<tt>\ ( ) &amp; &lt; &gt; , ; : &quot; [ ]</tt>, or any whitespace.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 295f7328f..6521150bc 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -849,7 +849,7 @@
A legal address must contain exactly one '@',
and at least one '.' after the @.
[% ELSE %]
- [%+ Param('emailregexpdesc') %]
+ [%+ Param('emailregexpdesc') FILTER html_light %]
[% END %]
It must also not contain any of these special characters:
<tt>\ ( ) &amp; &lt; &gt; , ; : &quot; [ ]</tt>, or any whitespace.