ignore "Shared"-directory when calculating free space

Conflicts:

	lib/fileproxy/quota.php

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 9e4c2d0643e46201985d9341cddc2ec51e1683f9..dab41c5e9066969f482f34e129505fb9594e0a1b 100644 (file)
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -54,8 +54,10 @@ class OC_FileProxy_Quota extends OC_FileProxy{
         * @return int
         */
        private function getFreeSpace(){
-               $rootInfo=OC_FileCache::get('');
-               $usedSpace=$rootInfo['size'];
+               $rootInfo=OC_FileCache_Cached::get('');
+               $sharedInfo=OC_FileCache_Cached::get('/Shared');
+               $usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
+               $usedSpace=isset($sharedInfo['size'])?$rootInfo['size']-$sharedInfo['size']:$rootInfo['size'];
                $totalSpace=$this->getQuota();
                if($totalSpace==0){
                        return 0;