Skip to content

dont try to copy trash items to user if the user has not enough free space #16534

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

Merged
rullzer merged 2 commits into from
Sep 4, 2019
Merged

dont try to copy trash items to user if the user has not enough free space #16534

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafce34
dont try to copy trash items to user if the user has not enough free …
icewind1991 Jul 25, 2019
9bf8ee7
Update apps/files_trashbin/lib/Trashbin.php
icewind1991 Sep 4, 2019
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
5 changes: 4 additions & 1 deletion apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user,

$target = $user . '/files_trashbin/files/' . $targetFilename . '.d' . $timestamp;
$source = $owner . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
self::copy_recursive($source, $target, $view);
$free = $view->free_space($target);
if (($free < 0) || ($view->filesize($source) < $free)) {
self::copy_recursive($source, $target, $view);
}


if ($view->file_exists($target)) {
Expand Down