Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.83
diff -u -p -r1.83 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc	13 Nov 2010 02:02:02 -0000	1.83
+++ modules/field_ui/field_ui.admin.inc	15 Nov 2010 19:09:13 -0000
@@ -377,8 +377,7 @@ function field_ui_field_overview_form($f
       ),
     );
 
-    if (!empty($instance['locked'])) {
-      $table[$name]['edit'] = array('#value' => t('Locked'));
+    if ($field['locked']) {
       $table[$name]['delete'] = array();
       $table[$name]['#attributes']['class'][] = 'menu-disabled';
     }
@@ -1733,13 +1732,6 @@ function field_ui_field_edit_form($form,
 
   $form['#field'] = $field;
 
-  if (!empty($field['locked'])) {
-    $form['locked'] = array(
-      '#markup' => t('The field %field is locked and cannot be edited.', array('%field' => $instance['label'])),
-    );
-    return $form;
-  }
-
   $field_type = field_info_field_types($field['type']);
   $widget_type = field_info_widget_types($instance['widget']['type']);
   $bundles = field_info_bundles();