projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.5. Core Media not yet in use.
[yaffs-website]
/
web
/
core
/
modules
/
file
/
src
/
FileAccessControlHandler.php
diff --git
a/web/core/modules/file/src/FileAccessControlHandler.php
b/web/core/modules/file/src/FileAccessControlHandler.php
index f4bda3cb7d266490ec216fe5c75bf62ff9991a1c..e378b648dfb95acad1894c6b6930d8450ed18d37 100644
(file)
--- a/
web/core/modules/file/src/FileAccessControlHandler.php
+++ b/
web/core/modules/file/src/FileAccessControlHandler.php
@@
-22,8
+22,12
@@
class FileAccessControlHandler extends EntityAccessControlHandler {
/** @var \Drupal\file\FileInterface $entity */
if ($operation == 'download' || $operation == 'view') {
if (\Drupal::service('file_system')->uriScheme($entity->getFileUri()) === 'public') {
/** @var \Drupal\file\FileInterface $entity */
if ($operation == 'download' || $operation == 'view') {
if (\Drupal::service('file_system')->uriScheme($entity->getFileUri()) === 'public') {
- // Always allow access to file in public file system.
- return AccessResult::allowed();
+ if ($operation === 'download') {
+ return AccessResult::allowed();
+ }
+ else {
+ return AccessResult::allowedIfHasPermission($account, 'access content');
+ }
}
elseif ($references = $this->getFileReferences($entity)) {
foreach ($references as $field_name => $entity_map) {
}
elseif ($references = $this->getFileReferences($entity)) {
foreach ($references as $field_name => $entity_map) {