Bug 561296: Updating the name of a field value wasn't working if the

value was the default for that field
r=LpSolit, a=LpSolit

diff --git a/editvalues.cgi b/editvalues.cgi
index 477bf86967a657fe3319b489518f3bdb918ff4a1..3109ff69e5169a103aecdc9e783cb154f7435456 100755 (executable)
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -185,12 +185,12 @@ if ($action eq 'edit') {
 if ($action eq 'update') {
     check_token_data($token, 'edit_field_value');
     $vars->{'value_old'} = $value->name;
-    $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'));
     }
+    $value->set_name($cgi->param('value_new'));
+    $value->set_sortkey($cgi->param('sortkey'));
+    $value->set_visibility_value($cgi->param('visibility_value_id'));
     $vars->{'changes'} = $value->update();
     delete_token($token);
     $vars->{'message'} = 'field_value_updated';