- Patch #606994 by yched: move entity handling out of Field API.

1 files changed, 2 insertions, 2 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'];