Skip to content

fix: allow file request upload when part_file_in_storage=false #62986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salmart-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

fix: allow file request upload when part_file_in_storage=false #62986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/private/Files/Storage/Wrapper/PermissionsMask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@
#[\Override]
public function rename(string $source, string $target): bool {
//This is a rename of the transfer file to the original file
if (dirname($source) === dirname($target) && strpos($source, '.ocTransferId') > 0) {
return $this->checkMask(Constants::PERMISSION_CREATE) && parent::rename($source, $target);
$sourceDir = dirname($source);
$targetDir = dirname($target);
if (($sourceDir === $targetDir || $sourceDir === dirname($targetDir)) && strpos($source, '.ocTransferId') > 0) {
return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($source, $target);

Check failure on line 77 in lib/private/Files/Storage/Wrapper/PermissionsMask.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UnrecognizedExpression 

lib/private/Files/Storage/Wrapper/PermissionsMask.php:77:11: UnrecognizedExpression: Logical binary operators AND and OR are not allowed in the Nextcloud codebase (see https://psalm.dev/048)
}
return $this->checkMask(Constants::PERMISSION_UPDATE) && parent::rename($source, $target);
}
Expand Down
Loading