summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-10-15 15:46:26 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-10-20 09:51:27 +0200
commitcf84a1128da8d70b9c0918233b69a59c9076dcf1 (patch)
tree429a3c42010942410c4331ff7219e81c492ec75d /apps
parent490101a3a1d557b5bfba8216a6caeb0167ef25dc (diff)
downloadnextcloud-server-cf84a1128da8d70b9c0918233b69a59c9076dcf1.tar.gz
nextcloud-server-cf84a1128da8d70b9c0918233b69a59c9076dcf1.zip
Fix trashbin handling of unknown/unlimited free space
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/lib/trashbin.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index ef015c3566a..839a47a7bf2 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -581,8 +581,9 @@ class Trashbin {
if ($quota === null || $quota === 'none') {
$quota = \OC\Files\Filesystem::free_space('/');
$softQuota = false;
- if ($quota === \OCP\Files\FileInfo::SPACE_UNKNOWN) {
- $quota = 0;
+ // inf or unknown free space
+ if ($quota < 0) {
+ $quota = PHP_INT_MAX;
}
} else {
$quota = \OCP\Util::computerFileSize($quota);