sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23982 from nextcloud/fix/quota-storage-getsize 

Make sure root storage is valid before checking its size
pull/23993/head
Morris Jobke 2020-11-09 11:03:25 +07:00 committed by GitHub
parent 005a132938 6a453ac184
commit 28464f71a2
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

5
lib/private/Files/Storage/Wrapper/Quota.php
Unescape Escape View File

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