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:
parent
fedfa4c98e
commit
cc3835d657
|
@ -55,7 +55,12 @@ class OC_FileProxy_Quota extends OC_FileProxy{
|
||||||
*/
|
*/
|
||||||
private function getFreeSpace(){
|
private function getFreeSpace(){
|
||||||
$rootInfo=OC_FileCache_Cached::get('');
|
$rootInfo=OC_FileCache_Cached::get('');
|
||||||
|
// TODO Remove after merge of share_api
|
||||||
|
if (OC_FileCache::inCache('/Shared')) {
|
||||||
$sharedInfo=OC_FileCache_Cached::get('/Shared');
|
$sharedInfo=OC_FileCache_Cached::get('/Shared');
|
||||||
|
} else {
|
||||||
|
$sharedInfo = null;
|
||||||
|
}
|
||||||
$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
|
$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
|
||||||
$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
|
$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
|
||||||
$totalSpace=$this->getQuota();
|
$totalSpace=$this->getQuota();
|
||||||
|
|
Loading…
Reference in New Issue