Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #644338 by yched: file_field_update() triggered a full entity load durung entity_save().

merge-requests/26/head
Dries Buytaert 2010-03-09 17:06:37 +00:00
parent 117f039a07
commit 2787acc050
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/file/file.field.inc
View File

@ -274,11 +274,11 @@ function file_field_update($entity_type, $entity, $field, $instance, $langcode,
$fids[] = $item['fid'];
}
// Delete items from original object.
list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
$load_function = $entity_type . '_load';
// Get the current values in the entity, and delete files for removed items.
list($id) = entity_extract_ids($entity_type, $entity);
$original = clone $entity;
field_attach_load($entity_type, array($id => $original), FIELD_LOAD_CURRENT, array('field_id' => $field['id']));
$original = $load_function($id);
if (!empty($original->{$field['field_name']}[$langcode])) {
foreach ($original->{$field['field_name']}[$langcode] as $original_item) {
if (isset($original_item['fid']) && !in_array($original_item['fid'], $fids)) {