diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-03-25 11:46:21 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-03-25 11:46:21 +0000 |
| commit | cfe7f8e69f9156284e1daf57921d89de256abda2 (patch) | |
| tree | 0fbf95426b255f46aa8df99c9db7bcbca3859b54 /modules/field/tests/field_test.storage.inc | |
| parent | 85969b0590391aae9b2995248d3dec5780b379da (diff) | |
| download | brdo-cfe7f8e69f9156284e1daf57921d89de256abda2.tar.gz brdo-cfe7f8e69f9156284e1daf57921d89de256abda2.tar.bz2 | |
- Patch #657972 by plach, Berdir: make field fallback logic actually reusable.
Diffstat (limited to 'modules/field/tests/field_test.storage.inc')
| -rw-r--r-- | modules/field/tests/field_test.storage.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc index 617e3b6ae..6ce272040 100644 --- a/modules/field/tests/field_test.storage.inc +++ b/modules/field/tests/field_test.storage.inc @@ -95,7 +95,7 @@ function field_test_field_storage_load($entity_type, $entities, $age, $fields, $ foreach ($field_data[$sub_table] as $row) { if ($row->type == $entity_type && (!$row->deleted || $options['deleted'])) { if (($load_current && in_array($row->entity_id, $ids)) || (!$load_current && in_array($row->revision_id, $ids))) { - if (in_array($row->language, field_multilingual_available_languages($entity_type, $field))) { + if (in_array($row->language, field_available_languages($entity_type, $field))) { if (!isset($delta_count[$row->entity_id][$row->language])) { $delta_count[$row->entity_id][$row->language] = 0; } @@ -127,7 +127,7 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) { $field_name = $field['field_name']; $field_data = &$data[$field_id]; - $all_languages = field_multilingual_available_languages($entity_type, $field); + $all_languages = field_available_languages($entity_type, $field); $field_languages = array_intersect($all_languages, array_keys((array) $entity->$field_name)); // Delete and insert, rather than update, in case a value was added. |