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

Merge pull request #24156 from nextcloud/backport/24112/stable20 

[stable20] Set up FS before querying storage info in settings
This commit is contained in:
Roeland Jago Douma 2020-11-16 14:14:43 +01:00 committed by GitHub
parent f4d92d2e3a 32758894a4
commit b14ec966c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/settings/lib/Settings/Personal/PersonalInfo.php
View File

@ -105,6 +105,9 @@ class PersonalInfo implements ISettings {
$user = $this->userManager->get($uid); $user = $this->userManager->get($uid);
$userData = $this->accountManager->getUser($user); $userData = $this->accountManager->getUser($user);
// make sure FS is setup before querying storage related stuff...
\OC_Util::setupFS($user->getUID());
$storageInfo = \OC_Helper::getStorageInfo('/'); $storageInfo = \OC_Helper::getStorageInfo('/');
if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) { if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
$totalSpace = $this->l->t('Unlimited'); $totalSpace = $this->l->t('Unlimited');

3
lib/private/legacy/OC_Helper.php
View File

@ -475,6 +475,9 @@ class OC_Helper {
/** /**
* Calculate the disc space for the given path * Calculate the disc space for the given path
* *
* BEWARE: this requires that Util::setupFS() was called
* already !
*
* @param string $path * @param string $path
* @param \OCP\Files\FileInfo $rootInfo (optional) * @param \OCP\Files\FileInfo $rootInfo (optional)
* @return array * @return array