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

Merge pull request #15540 from nextcloud/bugfix/noid/prevent-faulty-logs-from-nested-setupFS-calls 

Prevent faulty logs from nested setupFS calls
This commit is contained in:
Joas Schilling 2019-06-21 12:00:22 +02:00 committed by GitHub
parent c1eff72bdf 22fa6421e5
commit 9d121985dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/legacy/util.php
View File

@ -204,7 +204,7 @@ class OC_Util {
\OC\Files\Filesystem::initMountManager(); \OC\Files\Filesystem::initMountManager();
\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false); $prevLogging = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
\OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) { \OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) { if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) {
/** @var \OC\Files\Storage\Common $storage */ /** @var \OC\Files\Storage\Common $storage */
@ -279,7 +279,8 @@ class OC_Util {
}); });
OC_Hook::emit('OC_Filesystem', 'preSetup', array('user' => $user)); OC_Hook::emit('OC_Filesystem', 'preSetup', array('user' => $user));
\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(true);
\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($prevLogging);
//check if we are using an object storage //check if we are using an object storage
$objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null); $objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null);