From c5425cbfbac1293945df88895bd1e1176bd8a6fd Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 10 Apr 2011 21:42:20 +0200
Subject: - Patch #1065020 by Berdir: fixed E_STRICT warning when
 downloading/viewing a file or image.

---
 modules/file/file.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/file/file.module b/modules/file/file.module
index 224a08a4d..400270178 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -160,7 +160,8 @@ function file_file_download($uri, $field_type = 'file') {
     foreach ($field_references as $entity_type => $type_references) {
       foreach ($type_references as $id => $reference) {
         // Try to load $entity and $field.
-        $entity = reset(entity_load($entity_type, array($id)));
+        $entity = entity_load($entity_type, array($id));
+        $entity = reset($entity);
         $field = NULL;
         if ($entity) {
           // Load all fields for that entity.
-- 
cgit v1.2.3