From 420eac028f8b314502e6d00566dfe876e5792b4c Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Fri, 14 May 2010 07:26:39 -0700
Subject: [PATCH] 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

---
 editvalues.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/editvalues.cgi b/editvalues.cgi
index 477bf86967..3109ff69e5 100755
--- 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';
-- 
2.47.2