diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-21 09:08:38 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-21 09:08:38 +0200 |
| commit | 4d312f78497d0134ad2315863db69747be5dd108 (patch) | |
| tree | 95b0ef1b2e31cd322992cb45d51e87163511ea86 /lib | |
| parent | 69d7c763a9955151df08f96a25239fa7bfb450c6 (diff) | |
| parent | cc3835d65711a6db3472d2ef7f84a59b112dbe7c (diff) | |
| download | nextcloud-server-4d312f78497d0134ad2315863db69747be5dd108.tar.gz nextcloud-server-4d312f78497d0134ad2315863db69747be5dd108.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'lib')
| -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(); |