Bug 561296: A fix allowing updating a field value's name when it is

the default value
r=LpSolit, a=LpSolit

1 files changed, 3 insertions, 3 deletions

diff --git a/editvalues.cgi b/editvalues.cgi
index b651b23c2..a95385230 100755
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -181,12 +181,12 @@ if ($action eq 'edit') {
 if ($action eq 'update') {
     check_token_data($token, 'edit_field_value');
     $vars->{'value_old'} = $value->name;
+    if ($cgi->should_set('is_active')) {
+        $value->set_is_active($cgi->param('is_active'));
+    }
     $value->set_name($cgi->param('value_new'));
     $value->set_sortkey($cgi->param('sortkey'));
     $value->set_visibility_value($cgi->param('visibility_value_id'));
-    if (!($value->is_static || $value->is_default)) {
-        $value->set_is_active($cgi->param('is_active'));
-    }
     $vars->{'changes'} = $value->update();
     delete_token($token);
     $vars->{'message'} = 'field_value_updated';