From: Simon Green <mail@simon.green>
Date: Wed, 19 Aug 2015 06:29:11 +0000 (-0400)
Subject: Bug 1182782 - Changing multiple bugs at once can fail if the dontchange text has... 
X-Git-Tag: release-5.0.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=607d89d0449ce80ede45bf80d9e27f8f002940cc;p=thirdparty%2Fbugzilla.git

Bug 1182782 - Changing multiple bugs at once can fail if the dontchange text has been localized
r=dkl, a=simon
---

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 169cf8a51f..778c3e142f 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -121,8 +121,8 @@
                 class="flag_select flag_type-[% type.id %]"
                 [% IF !can_edit_flag %] disabled="disabled"[% END %]>
         [%# Only display statuses the user is allowed to set. %]
-        [% IF edit_multiple_bugs %]
-          <option value="--do_not_change--">--do_not_change--</option>
+        [% IF edit_multiple_bugs && dontchange %]
+          <option value="[% dontchange FILTER html %]">[% dontchange FILTER html %]</option>
         [% END %]
         [% IF !flag || (can_edit_flag && user.can_request_flag(type)) || flag.setter_id == user.id %]
           <option value="X" label="X"></option>