From ac0cce02a29d8fd800048ce6b980e1ddc46aeded Mon Sep 17 00:00:00 2001 From: OnkelTem Date: Wed, 27 Mar 2013 15:15:42 +0400 Subject: [PATCH] Issue #1954186 by OnkelTem: Make file_view_multiple() compatible with Entity API --- file_entity.field.inc | 2 +- file_entity.file_api.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/file_entity.field.inc b/file_entity.field.inc index 43016ff..ef1cc50 100644 --- a/file_entity.field.inc +++ b/file_entity.field.inc @@ -102,7 +102,7 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan $files_display[$fid]->referencing_entity = $entity; $files_display[$fid]->referencing_field = $field['field_name']; } - $files_built = file_view_multiple($files_display, $view_mode); + $files_built = file_view_multiple(reset($files_display, $view_mode)); } // Assemble the render array. diff --git a/file_entity.file_api.inc b/file_entity.file_api.inc index 1f089a9..472a230 100644 --- a/file_entity.file_api.inc +++ b/file_entity.file_api.inc @@ -81,11 +81,11 @@ function file_view_multiple($files, $view_mode = 'full', $weight = 0, $langcode $build = array(); foreach ($files as $file) { - $build[$file->fid] = file_view($file, $view_mode, $langcode); - $build[$file->fid]['#weight'] = $weight; + $build['files'][$file->fid] = file_view($file, $view_mode, $langcode); + $build['files'][$file->fid]['#weight'] = $weight; $weight++; } - $build['#sorted'] = TRUE; + $build['files']['#sorted'] = TRUE; return $build; } -- 1.7.9.5