summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReed Loden <reed@reedloden.com>2012-09-13 02:03:05 +0200
committerReed Loden <reed@reedloden.com>2012-09-13 02:03:05 +0200
commitc0451185773b3e4d0e8a66fc0d1612cb8185542b (patch)
tree27d35f43d8fdee6b394e785c9c7b9c81a4bac2ac
parentee2c1f16d6e24fa110939d0979e64f1a6f3db357 (diff)
parent3645d207cfbd2596ba86ef83394894ee7ae24df7 (diff)
downloadbugzilla-c0451185773b3e4d0e8a66fc0d1612cb8185542b.tar.gz
bugzilla-c0451185773b3e4d0e8a66fc0d1612cb8185542b.tar.xz
Merge from bugzilla/4.2
-rw-r--r--template/en/default/filterexceptions.pl1
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl2
2 files changed, 1 insertions, 2 deletions
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 99f06ec9d..dfa1083bd 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -211,7 +211,6 @@
'global/confirm-user-match.html.tmpl' => [
'script',
- 'fields.${field_name}.flag_type.name',
],
'global/site-navigation.html.tmpl' => [
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index cff20d237..971bf2f34 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -199,7 +199,7 @@
[% ELSIF field_labels.$field_name %]
[% field_labels.$field_name FILTER html %]
[% ELSIF field_name.match("^requestee") %]
- [% fields.${field_name}.flag_type.name %] requestee
+ [% fields.${field_name}.flag_type.name FILTER html %] requestee
[% ELSE %]
[% field_name FILTER html %]
[% END %]