Commit 37f18786 authored by webchick's avatar webchick

Issue #943924 by Merco, lotyrin, eojthebrave: Fixed Allow preview of private...

Issue #943924 by Merco, lotyrin, eojthebrave: Fixed Allow preview of private image on node add form.
parent 826ae5ac
......@@ -142,10 +142,14 @@ function file_file_download($uri, $field_type = 'file') {
// Find out which (if any) fields of this type contain the file.
$references = file_get_file_references($file, NULL, FIELD_LOAD_CURRENT, $field_type);
// If there are no references, stop processing, to avoid returning headers
// for files controlled by other modules.
if (empty($references)) {
return;
// Stop processing if there are no references in order to avoid returning
// headers for files controlled by other modules. Make an exception for
// temporary files where the host entity has not yet been saved (for example,
// an image preview on a node/add form) in which case, allow download by the
// file's owner.
if(empty($references) && ($file->status == FILE_STATUS_PERMANENT || $file->uid != $user->uid)) {
return;
}
// Default to allow access.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment