From 964588fcbf202b6bf9714659c7d8ef65b501ee62 Mon Sep 17 00:00:00 2001 From: "Frederic G. MARAND" Date: Wed, 6 May 2015 18:02:17 +0200 Subject: [PATCH] Issue #1446464: avoid file_field_load() on empty image fields --- modules/image/image.field.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc index 6d1867c..2ff270d 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -192,7 +192,20 @@ function _image_field_resolution_validate($element, &$form_state) { * Implements hook_field_load(). */ function image_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) { - file_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age); + $items2 = array(); + foreach ($items as $entity_id => $entity_items) { + if (count($entity_items) > 0) { + $items2[$entity_id] = $entity_items; + } + } + if (empty($items2)) { + return; + } + + file_field_load($entity_type, $entities, $field, $instances, $langcode, $items2, $age); + foreach ($items2 as $entity_id => $entity_items) { + $items[$entity_id] = $items2[$entity_id]; + } } /** -- 1.7.9.5