summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2011-10-17 16:07:31 (GMT)
committerwebchick2011-10-17 16:07:31 (GMT)
commit37f1878633e71f2302d65fde7b7c664f389e7c97 (patch)
tree2456b34a519613835759c4039f04ec34018ef053
parent826ae5ac4eb47f96cb55633d541160866bbb33d9 (diff)
Issue #943924 by Merco, lotyrin, eojthebrave: Fixed Allow preview of private image on node add form.
-rw-r--r--modules/file/file.module12
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/file/file.module b/modules/file/file.module
index 4fc9985..9fcdfe0 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -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.