From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 6 Jul 2010 00:49:09 +0000 (+0200)
Subject: Bug 576916: 'keywordaction' is undefined when editing a single bug
X-Git-Tag: bugzilla-3.7.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=122c0407902c08b974ac552898a3bed3a2025a7d;p=thirdparty%2Fbugzilla.git

Bug 576916: 'keywordaction' is undefined when editing a single bug
r/a=mkanat
---

diff --git a/process_bug.cgi b/process_bug.cgi
index f6da2af611..7126d5d8b7 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -258,7 +258,8 @@ foreach my $field_name (@set_fields) {
 }
 
 if (should_set('keywords')) {
-    my $action = $cgi->param('keywordaction');
+    my $action = $cgi->param('keywordaction') || '';
+    # Backward-compatibility for Bugzilla 3.x and older.
     $action = 'remove' if $action eq 'delete';
     $action = 'set'    if $action eq 'makeexact';
     $set_all_fields{keywords}->{$action} = $cgi->param('keywords');
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 03e1395a1b..736f2c71a2 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -230,8 +230,8 @@
         %]
         <select name="keywordaction">
           <option value="add">Add these keywords</option>
-          <option value="delete">Delete these keywords</option>
-          <option value="makeexact">Make the keywords be exactly this list</option>
+          <option value="remove">Delete these keywords</option>
+          <option value="set">Make the keywords be exactly this list</option>
         </select>
       </td>