diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 21:28:49 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 21:28:49 +0400 |
| commit | ee309773837bfcaeaebb922fe4535df392cd14ae (patch) | |
| tree | 036269608dea75b90509e9b65aaa422da0d21379 /apps | |
| parent | cdb7f404122e88b18765d8919a0146808486ba18 (diff) | |
| parent | ca57a849ffc73aa4c8feba972b3e36138fecb089 (diff) | |
Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc
When reading the size of "files" mountpoints need to be excluded
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/lib/versions.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 769fd8d8990..7544980e071 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -734,7 +734,7 @@ class Trashbin { // calculate available space for trash bin // subtract size of files and current trash bin size from quota if ($softQuota) { - $rootInfo = $view->getFileInfo('/files/'); + $rootInfo = $view->getFileInfo('/files/', false); $free = $quota - $rootInfo['size']; // remaining free space for user if ($free > 0) { $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 7e6cc818efb..f268fa10b66 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -445,7 +445,7 @@ class Storage { // subtract size of files and current versions size from quota if ($softQuota) { $files_view = new \OC\Files\View('/'.$uid.'/files'); - $rootInfo = $files_view->getFileInfo('/'); + $rootInfo = $files_view->getFileInfo('/', false); $free = $quota-$rootInfo['size']; // remaining free space for user if ( $free > 0 ) { $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - ($versionsSize + $offset); // how much space can be used for versions |