summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-03-04 12:17:57 +0100
committerBjörn Schießle <schiessle@owncloud.com>2013-03-04 12:17:57 +0100
commit94dab96dba98ad8a26d157c40ff91b5311e4f373 (patch)
tree351bb4d92938a8067c0618d2775927372971e9b5 /apps/files_trashbin
parent36a1bcb73251e9fade635431f29a336ccb231115 (diff)
downloadnextcloud-server-94dab96dba98ad8a26d157c40ff91b5311e4f373.tar.gz
nextcloud-server-94dab96dba98ad8a26d157c40ff91b5311e4f373.zip
fix quota calculation for trash and versions
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/lib/trash.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 6dedd314cf2..ee95765bc77 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -108,7 +108,7 @@ class Trashbin {
if ( $quota === null || $quota === 'default') {
$quota = \OC_Appconfig::getValue('files', 'default_quota');
}
- if ( $quota === null ) {
+ if ( $quota === null || $quote === 'none' ) {
$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
} else {
$quota = \OCP\Util::computerFileSize($quota);