mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22892 from nextcloud/backport/22744/stable19 

[stable19] only get the permissions from the share source if it's not already cached
This commit is contained in:
Morris Jobke 2020-09-16 20:21:12 +02:00 committed by GitHub
parent c1a7a026f6 f140e3a03a
commit eff6e53125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_sharing/lib/Cache.php
View File

@ -146,17 +146,16 @@ class Cache extends CacheJail {
} }
try { try {
$sharePermissions = $this->storage->getPermissions($entry['path']); if (isset($entry['permissions'])) {
$entry['permissions'] &= $this->storage->getShare()->getPermissions();
} else {
$entry['permissions'] = $this->storage->getPermissions($entry['path']);
}
} catch (StorageNotAvailableException $e) { } catch (StorageNotAvailableException $e) {
// thrown by FailedStorage e.g. when the sharer does not exist anymore // thrown by FailedStorage e.g. when the sharer does not exist anymore
// (IDE may say the exception is never thrown – false negative) // (IDE may say the exception is never thrown – false negative)
$sharePermissions = 0; $sharePermissions = 0;
} }
if (isset($entry['permissions'])) {
$entry['permissions'] &= $sharePermissions;
} else {
$entry['permissions'] = $sharePermissions;
}
$entry['uid_owner'] = $this->storage->getOwner(''); $entry['uid_owner'] = $this->storage->getOwner('');
$entry['displayname_owner'] = $this->getOwnerDisplayName(); $entry['displayname_owner'] = $this->getOwnerDisplayName();
if ($path === '') { if ($path === '') {