diff -u b/includes/media.filter.inc b/includes/media.filter.inc --- b/includes/media.filter.inc +++ b/includes/media.filter.inc @@ -94,23 +94,24 @@ $file_references = array(); foreach (_media_filter_fields_with_text_filtering($entity_type, $entity) as $field_name) { - $field_items = field_get_items($entity_type, $entity, $field_name); - foreach ($field_items as $field_item) { - preg_match_all(MEDIA_TOKEN_REGEX, $field_item['value'], $matches); - foreach ($matches[0] as $tag) { - $tag = str_replace(array('[[', ']]'), '', $tag); - $tag_info = drupal_json_decode($tag); - if (isset($tag_info['fid'])) { - $file_references[] = $tag_info; + if ($field_items = field_get_items($entity_type, $entity, $field_name)) { + foreach ($field_items as $field_item) { + preg_match_all(MEDIA_TOKEN_REGEX, $field_item['value'], $matches); + foreach ($matches[0] as $tag) { + $tag = str_replace(array('[[', ']]'), '', $tag); + $tag_info = drupal_json_decode($tag); + if (isset($tag_info['fid'])) { + $file_references[] = $tag_info; + } } - } - preg_match_all(MEDIA_TOKEN_REGEX_ALT, $field_item['value'], $matches_alt); - foreach ($matches_alt[0] as $tag) { - $tag = urldecode($tag); - $tag_info = drupal_json_decode($tag); - if (isset($tag_info['fid'])) { - $file_references[] = $tag_info; + preg_match_all(MEDIA_TOKEN_REGEX_ALT, $field_item['value'], $matches_alt); + foreach ($matches_alt[0] as $tag) { + $tag = urldecode($tag); + $tag_info = drupal_json_decode($tag); + if (isset($tag_info['fid'])) { + $file_references[] = $tag_info; + } } } }