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

Merge pull request #23996 from nextcloud/backport/23982/stable20 

[stable20] Make sure root storage is valid before checking its size
This commit is contained in:
Morris Jobke 2020-11-09 15:37:24 +01:00 committed by GitHub
parent 3459db0472 0c4297cee9
commit 1a26b63246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Files/Storage/Wrapper/Quota.php
View File

@ -71,7 +71,10 @@ class Quota extends Wrapper {
protected function getSize($path, $storage = null) { protected function getSize($path, $storage = null) {
if ($this->config->getValue('quota_include_external_storage', false)) { if ($this->config->getValue('quota_include_external_storage', false)) {
$rootInfo = Filesystem::getFileInfo('', 'ext'); $rootInfo = Filesystem::getFileInfo('', 'ext');
if ($rootInfo) {
return $rootInfo->getSize(true); return $rootInfo->getSize(true);
}
return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED;
} else { } else {
if (is_null($storage)) { if (is_null($storage)) {
$cache = $this->getCache(); $cache = $this->getCache();