From 601150c2627c017b29a1f240dc7398b36b7ca47f Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 13 Dec 2009 12:42:28 +0000 Subject: - Patch #658302 by yched: re-purpose hook_field_sanitize() into hook_field_prepare_view(). --- modules/file/file.field.inc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'modules/file/file.field.inc') diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index 456598606..cdd853f28 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -228,18 +228,19 @@ function file_field_load($obj_type, $objects, $field, $instances, $langcode, &$i } /** - * Implements hook_field_sanitize(). + * Implements hook_field_prepare_view(). */ -function file_field_sanitize($obj_type, $object, $field, $instance, $langcode, &$items) { - // Remove files from being displayed if they're not displayed. - foreach ($items as $delta => $item) { - if (!file_field_displayed($item, $field)) { - unset($items[$delta]); +function file_field_prepare_view($obj_type, $objects, $field, $instances, $langcode, &$items) { + // Remove files specified to not be displayed. + foreach ($objects as $id => $object) { + foreach ($items[$id] as $delta => $item) { + if (!file_field_displayed($item, $field)) { + unset($items[$id][$delta]); + } + // Ensure consecutive deltas. + $items[$id] = array_values($items[$id]); } } - - // Return the items including only displayed files. - $items = array_values($items); } /** -- cgit v1.2.3