diff --git a/modules/field/modules/list/tests/list_test.module b/modules/field/modules/list/tests/list_test.module index 2d25daafe1e..aa5333779e8 100644 --- a/modules/field/modules/list/tests/list_test.module +++ b/modules/field/modules/list/tests/list_test.module @@ -8,7 +8,7 @@ /** * Allowed values callback. */ -function list_test_allowed_values_callback($field, $instance, $entity_type, $entity) { +function list_test_allowed_values_callback($field) { $values = array( 'Group 1' => array( 0 => 'Zero', diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index ad3f19aadb2..981649d2aca 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1493,7 +1493,7 @@ function taxonomy_field_widget_info_alter(&$info) { */ function taxonomy_options_list($field, $instance, $entity_type, $entity) { $function = !empty($field['settings']['options_list_callback']) ? $field['settings']['options_list_callback'] : 'taxonomy_allowed_values'; - return $function($field, $instance, $entity_type, $entity); + return $function($field); } /** @@ -1646,20 +1646,10 @@ function taxonomy_field_formatter_view($entity_type, $entity, $field, $instance, * * @param $field * The field definition. - * @param $instance - * The instance definition. It is recommended to only use instance level - * properties to filter out values from a list defined by field level - * properties. - * @param $entity_type - * The entity type the field is attached to. - * @param $entity - * The entity object the field is attached to, or NULL if no entity - * exists (e.g. in field settings page). - * * @return * The array of valid terms for this field, keyed by term id. */ -function taxonomy_allowed_values($field, $instance, $entity_type, $entity) { +function taxonomy_allowed_values($field) { $options = array(); foreach ($field['settings']['allowed_values'] as $tree) { if ($vocabulary = taxonomy_vocabulary_machine_name_load($tree['vocabulary'])) {