summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-04-10 21:42:20 +0200
committerDries Buytaert <dries@buytaert.net>2011-04-10 21:42:20 +0200
commitc5425cbfbac1293945df88895bd1e1176bd8a6fd (patch)
treed2a649313ebfc3f32b36beae9107f12508495473 /modules
parent5e1e44c4c03e6a305c01a71ed835a7c09dc577ee (diff)
downloadbrdo-c5425cbfbac1293945df88895bd1e1176bd8a6fd.tar.gz
brdo-c5425cbfbac1293945df88895bd1e1176bd8a6fd.tar.bz2
- Patch #1065020 by Berdir: fixed E_STRICT warning when downloading/viewing a file or image.
Diffstat (limited to 'modules')
-rw-r--r--modules/file/file.module3
1 files changed, 2 insertions, 1 deletions
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.