diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-01 12:03:28 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2019-03-01 12:03:33 +0100 |
| commit | f6967a974f430a60cb3e3ccdf5b27c46eb27a200 (patch) | |
| tree | b160dd80b96602626211239af589b5991bc13bcb /apps/files_trashbin/lib | |
| parent | fb5a2496e223528e798725335806c554b7cc28db (diff) | |
| download | nextcloud-server-f6967a974f430a60cb3e3ccdf5b27c46eb27a200.tar.gz nextcloud-server-f6967a974f430a60cb3e3ccdf5b27c46eb27a200.zip | |
Revert "Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)"
This reverts commit e806aa658c16fadad465504fab4aeef314832bdb.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_trashbin/lib')
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 5adbdeca6ad..96c6a4c0af7 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -680,10 +680,11 @@ class Trashbin { // calculate available space for trash bin // subtract size of files and current trash bin size from quota if ($softQuota) { - $files_view = new View('/' . $user . '/files'); - $rootInfo = $files_view->getFileInfo('/', false); - $free = $quota - $rootInfo['size']; // remaining free space for user - + $userFolder = \OC::$server->getUserFolder($user); + if(is_null($userFolder)) { + return 0; + } + $free = $quota - $userFolder->getSize(); // remaining free space for user if ($free > 0) { $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions } else { |