mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Gapczynski 2012-06-20 19:24:07 -04:00
parent fedfa4c98e
commit cc3835d657
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/fileproxy/quota.php
View File

@ -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();