From b7cc7bd6456cbd8dfd02d924ecc892e7967e4657 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc index 6d1867c..00e8925 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -192,7 +192,9 @@ 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); + if ($items) { + file_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age); + } } /** -- 1.7.9.5