diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 20:10:09 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-20 20:11:33 +0400 |
| commit | ca57a849ffc73aa4c8feba972b3e36138fecb089 (patch) | |
| tree | 7bcd4c7b3f2539a89d652fc4d0394e9ba5659156 /apps | |
| parent | bd643c47f32ba6d7b3ba6a18ed1591aab0b81be8 (diff) | |
When reading the size of "files" mountpoints need to be excluded
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.
This is because the default call (legacy) used to return the size of
mount points as well.
Fixes #6731
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 |