aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReed Loden <reed@reedloden.com>2012-09-11 12:17:48 -0700
committerReed Loden <reed@reedloden.com>2012-09-11 12:17:48 -0700
commitbce82353fea1ec435028731a05a65a23b08055d0 (patch)
treeb6642b48488acafd254063473bccd9770bf2cfc0
parentBumped version post-release (diff)
downloadbugzilla-bce82353fea1ec435028731a05a65a23b08055d0.tar.gz
bugzilla-bce82353fea1ec435028731a05a65a23b08055d0.tar.bz2
bugzilla-bce82353fea1ec435028731a05a65a23b08055d0.zip
Bug 790215 - Flag names are not properly escaped when displayed on confirm user match page
[r=LpSolit a=LpSolit]
-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 2ed929493..d37f3202c 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -227,7 +227,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 67a901f0e..c8ef9f548 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -194,7 +194,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 %]