Bug 430307: Unsafe regexp used in global/userselect.html.tmpl - Patch by Jesse Clark...

diff --git a/template/en/default/global/userselect.html.tmpl b/template/en/default/global/userselect.html.tmpl
index 7a46891abdbc1c0c28bf92ea1d0c6cd2909247a0..827a190669dee44c1a6085cd16f83e163c2a845b 100644 (file)
--- a/template/en/default/global/userselect.html.tmpl
+++ b/template/en/default/global/userselect.html.tmpl
@@ -40,10 +40,14 @@
   [% IF emptyok %]
     <option value=""></option>
   [% END %]
+  [% SET selected = {} %]
+  [% FOREACH selected_value IN value.split(', ') %]
+    [% SET selected.$selected_value = 1 %]
+  [% END %]
   [% FOREACH tmpuser = user.get_userlist %]
-    [% IF tmpuser.visible OR value.match("\\b$tmpuser.login\\b") %]
+    [% IF tmpuser.visible OR selected.${tmpuser.login} == 1 %]
       <option value="[% tmpuser.login FILTER html %]"
-        [% " selected=\"selected\"" IF value.match("\\b$tmpuser.login\\b") %]
+        [% " selected=\"selected\"" IF selected.${tmpuser.login} == 1 %]
       >[% tmpuser.identity FILTER html %]</option>
     [% END %]
   [% END %]