Change free space calculation

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 1e22349f2bb29c5d6fd91af22fa07f4b0a909552..6e7ef18b139f245de3ae86fe950c1ed7a47ea2c9 100644 (file)
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -708,11 +708,13 @@ class Trashbin {
         */
        private static function calculateFreeSpace($trashbinSize, $user) {
                $config = \OC::$server->getConfig();
-               $systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
                $userTrashbinSize = (int)$config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
-               $configuredTrashbinSize = ($userTrashbinSize < 0) ? $systemTrashbinSize : $userTrashbinSize;
-               if ($configuredTrashbinSize) {
-                       return $configuredTrashbinSize - $trashbinSize;
+               if ($userTrashbinSize > -1) {
+                       return $userTrashbinSize - $trashbinSize;
+               }
+               $systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
+               if ($systemTrashbinSize > -1) {
+                       return $systemTrashbinSize - $trashbinSize;
                }
 
                $softQuota = true;