diff options
Diffstat (limited to 'modules/file')
| -rw-r--r-- | modules/file/file.field.inc | 4 | ||||
| -rw-r--r-- | modules/file/file.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index 6375c0174..1d8da328a 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -267,7 +267,7 @@ function file_field_update($obj_type, $object, $field, $instance, $langcode, &$i } // Delete items from original object. - list($id, $vid, $bundle) = field_extract_ids($obj_type, $object); + list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object); $load_function = $obj_type . '_load'; $original = $load_function($id); @@ -287,7 +287,7 @@ function file_field_update($obj_type, $object, $field, $instance, $langcode, &$i * Implement hook_field_delete(). */ function file_field_delete($obj_type, $object, $field, $instance, $langcode, &$items) { - list($id, $vid, $bundle) = field_extract_ids($obj_type, $object); + list($id, $vid, $bundle) = entity_extract_ids($obj_type, $object); foreach ($items as $delta => $item) { // For hook_file_references(), remember that this is being deleted. $item['file_field_name'] = $field['field_name']; diff --git a/modules/file/file.module b/modules/file/file.module index 45e23d508..36357e893 100644 --- a/modules/file/file.module +++ b/modules/file/file.module @@ -858,7 +858,7 @@ function file_icon_map($file) { */ function file_get_file_reference_count($file, $field = NULL, $field_type = 'file') { $fields = field_info_fields(NULL, $field, $field_type); - $types = field_info_fieldable_types(); + $types = entity_get_info(); $reference_count = 0; foreach ($fields as $field) { @@ -875,7 +875,7 @@ function file_get_file_reference_count($file, $field = NULL, $field_type = 'file // If deleting the entire piece of content, decrement references. if (isset($file->file_field_type) && isset($file->file_field_id)) { if ($file->file_field_type == $obj_type) { - $info = field_info_fieldable_types($obj_type); + $info = entity_get_info($obj_type); $id = $types[$obj_type]['object keys']['id']; foreach ($type_references as $reference) { if ($file->file_field_id == $reference->$id) { |