Skip to content
Snippets Groups Projects
Commit cc3835d6 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Only call OC_FileCache::get('/Shared') if it exists in the file cache,...

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
parent fedfa4c9
No related branches found
No related tags found
No related merge requests found
......@@ -55,7 +55,12 @@ class OC_FileProxy_Quota extends OC_FileProxy{
*/
private function getFreeSpace(){
$rootInfo=OC_FileCache_Cached::get('');
// 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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment