diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-20 19:24:07 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-20 19:39:17 -0400 |
| commit | cc3835d65711a6db3472d2ef7f84a59b112dbe7c (patch) | |
| tree | adf81a35589862e3ba05cd1234fb3e3722a53395 /lib/fileproxy | |
| parent | fedfa4c98e9093fc3499745909c81cce381e2624 (diff) | |
| download | nextcloud-server-cc3835d65711a6db3472d2ef7f84a59b112dbe7c.tar.gz nextcloud-server-cc3835d65711a6db3472d2ef7f84a59b112dbe7c.zip | |
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
Conflicts:
lib/fileproxy/quota.php
Diffstat (limited to 'lib/fileproxy')
| -rw-r--r-- | lib/fileproxy/quota.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php index b0c3775b9db..7316224cc61 100644 --- a/lib/fileproxy/quota.php +++ b/lib/fileproxy/quota.php @@ -55,7 +55,12 @@ class OC_FileProxy_Quota extends OC_FileProxy{ */ private function getFreeSpace(){ $rootInfo=OC_FileCache_Cached::get(''); - $sharedInfo=OC_FileCache_Cached::get('/Shared'); + // TODO Remove after merge of share_api + if (OC_FileCache::inCache('/Shared')) { + $sharedInfo=OC_FileCache_Cached::get('/Shared'); + } else { + $sharedInfo = null; + } $usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0; $usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace; $totalSpace=$this->getQuota(); |