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

Merge pull request #22921 from nextcloud/no-root-encryption-wrapper 

dont apply encryption wrapper for root mount
This commit is contained in:
Julius Härtl 2020-12-29 14:08:53 +01:00 committed by GitHub
parent 83ab996b16 8501cf9b5c
commit d2e67312bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Encryption/EncryptionWrapper.php
View File

@ -81,7 +81,7 @@ class EncryptionWrapper {
'mount' => $mount 'mount' => $mount
]; ];
if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) { if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') {
$user = \OC::$server->getUserSession()->getUser(); $user = \OC::$server->getUserSession()->getUser();
$mountManager = Filesystem::getMountManager(); $mountManager = Filesystem::getMountManager();
$uid = $user ? $user->getUID() : null; $uid = $user ? $user->getUID() : null;