diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-27 05:52:50 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-27 05:52:50 +0000 |
| commit | 7d4b84b8789ffd3ad22dc987860f46c18f9d0f07 (patch) | |
| tree | a5e7429b505f079ea6e0938f4f7773719200c915 /modules/file | |
| parent | f86fda29a3e004e7e38a5d039aa0869a5bd6d888 (diff) | |
| download | brdo-7d4b84b8789ffd3ad22dc987860f46c18f9d0f07.tar.gz brdo-7d4b84b8789ffd3ad22dc987860f46c18f9d0f07.tar.bz2 | |
#707724 follow-up by yched: Fix more confusing field/entity api arguments.
Diffstat (limited to 'modules/file')
| -rw-r--r-- | modules/file/file.field.inc | 2 | ||||
| -rw-r--r-- | modules/file/file.module | 2 | ||||
| -rw-r--r-- | modules/file/tests/file.test | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index a304573b0..57c47ae1e 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -246,7 +246,7 @@ function file_field_prepare_view($entity_type, $entities, $field, $instances, $l /** * Implements hook_field_presave(). */ -function file_field_presave($obj_type, $object, $field, $instance, $langcode, &$items) { +function file_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) { // Make sure that each file which will be saved with this object has a // permanent status, so that it will not be removed when temporary files are // cleaned up. diff --git a/modules/file/file.module b/modules/file/file.module index 0eba84715..84a006dd6 100644 --- a/modules/file/file.module +++ b/modules/file/file.module @@ -915,7 +915,7 @@ function file_get_file_reference_count($file, $field = NULL, $field_type = NULL) if (isset($file->file_field_type) && isset($file->file_field_id)) { if ($file->file_field_type == $entity_type) { $info = entity_get_info($entity_type); - $id = $types[$entity_type]['object keys']['id']; + $id = $types[$entity_type]['entity keys']['id']; foreach ($type_references as $reference) { if ($file->file_field_id == $reference->$id) { $reference_count--; diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test index 2a731ffd1..7a9a14095 100644 --- a/modules/file/tests/file.test +++ b/modules/file/tests/file.test @@ -57,7 +57,7 @@ class FileFieldTestCase extends DrupalWebTestCase { $instance = array( 'field_name' => $field['field_name'], - 'object_type' => 'node', + 'entity_type' => 'node', 'label' => $name, 'bundle' => $type_name, 'required' => !empty($instance_settings['required']), |