diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-11 17:44:47 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-11 17:44:47 +0000 |
| commit | 7562a8efb36306e96bf4d13b1f97b4573809ab45 (patch) | |
| tree | 998dfd1d27d9c1a691a83a0c0e37d783d4fc4a44 /modules/field/modules/text/text.module | |
| parent | 52195a6b1dd478875a93935df27d7bcacb14f289 (diff) | |
| download | brdo-7562a8efb36306e96bf4d13b1f97b4573809ab45.tar.gz brdo-7562a8efb36306e96bf4d13b1f97b4573809ab45.tar.bz2 | |
#707724 by chx: Rename confusing arguments in field/entity APIs.
Diffstat (limited to 'modules/field/modules/text/text.module')
| -rw-r--r-- | modules/field/modules/text/text.module | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index a3389e9d1..9f8a5c6d0 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -167,7 +167,7 @@ function text_field_instance_settings_form($field, $instance) { * - 'text_value_max_length': The value exceeds the maximum length. * - 'text_summary_max_length': The summary exceeds the maximum length. */ -function text_field_validate($obj_type, $object, $field, $instance, $langcode, $items, &$errors) { +function text_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { foreach ($items as $delta => $item) { // @todo Length is counted separately for summary and value, so the maximum // length can be exceeded very easily. @@ -201,8 +201,8 @@ function text_field_validate($obj_type, $object, $field, $instance, $langcode, $ * separately. * @see text_field_formatter_view(). */ -function text_field_load($obj_type, $objects, $field, $instances, $langcode, &$items) { - foreach ($objects as $id => $object) { +function text_field_load($entity_type, $entities, $field, $instances, $langcode, &$items) { + foreach ($entities as $id => $entity) { foreach ($items[$id] as $delta => $item) { // Only process items with a cacheable format, the rest will be handled // by formatters if needed. @@ -264,7 +264,7 @@ function text_field_formatter_info() { /** * Implements hook_field_formatter_view(). */ -function text_field_formatter_view($object_type, $object, $field, $instance, $langcode, $items, $display) { +function text_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { $element = array(); switch ($display['type']) { |