Revert "Fix for issue 10862: calculation of free space ignores external storage ...

This reverts commit e806aa658c16fadad465504fab4aeef314832bdb.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 5adbdeca6ade29f1bc796c7359517bcce0b94afa..96c6a4c0af791d01fce3f4f18131d03b9d9a3956 100644 (file)
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -680,10 +680,11 @@ class Trashbin {
                // calculate available space for trash bin
                // subtract size of files and current trash bin size from quota
                if ($softQuota) {
-                       $files_view = new View('/' . $user . '/files');
-                       $rootInfo = $files_view->getFileInfo('/', false);
-                       $free = $quota - $rootInfo['size']; // remaining free space for user
-
+                       $userFolder = \OC::$server->getUserFolder($user);
+                       if(is_null($userFolder)) {
+                               return 0;
+                       }
+                       $free = $quota - $userFolder->getSize(); // remaining free space for user
                        if ($free > 0) {
                                $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
                        } else {