diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-30 11:19:30 +0200 |
|---|---|---|
| committer | Côme Chilliet (Rebase PR Action) <come-nc@users.noreply.github.com> | 2022-04-05 13:58:49 +0000 |
| commit | 916fbe81c6baabb59e7d5444cbc04bf696f679df (patch) | |
| tree | f44593c9ae817aac0f56ccbcc4e8121ddb6dc32c | |
| parent | 40f6f602324e663b2e41dd4d7b5b947e55f4077b (diff) | |
| download | nextcloud-server-916fbe81c6baabb59e7d5444cbc04bf696f679df.tar.gz nextcloud-server-916fbe81c6baabb59e7d5444cbc04bf696f679df.zip | |
Fix incorrect if conditions in View
($something->getPermissions() && Constants::PERMISSION_READ) does not
make sense as PERMISSION_READ contant is 1 this will always evaluate to
true.
getPersmissions is returning an int which is a bitwise combination as
documented in the interface, so it should be used with bit operators.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | lib/private/Files/View.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index d80ae041d57..4a9c6fd3bcb 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1180,7 +1180,7 @@ class View { throw $e; } - if ($result && in_array('delete', $hooks) and $result) { + if ($result && in_array('delete', $hooks)) { $this->removeUpdate($storage, $internalPath); } if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') { @@ -1450,7 +1450,7 @@ class View { $data = $this->getCacheEntry($storage, $internalPath, $directory); - if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() && Constants::PERMISSION_READ)) { + if (!$data instanceof ICacheEntry || !isset($data['fileid']) || !($data->getPermissions() & Constants::PERMISSION_READ)) { return []; } @@ -1504,7 +1504,7 @@ class View { $rootEntry = $subCache->get(''); } - if ($rootEntry && ($rootEntry->getPermissions() && Constants::PERMISSION_READ)) { + if ($rootEntry && ($rootEntry->getPermissions() & Constants::PERMISSION_READ)) { $relativePath = trim(substr($mountPoint, $dirLength), '/'); if ($pos = strpos($relativePath, '/')) { //mountpoint inside subfolder add size to the correct folder |