diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-05-15 10:22:51 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2019-05-15 10:22:51 +0200 |
| commit | 22fa6421e5d6751d707c28fe742901534a8c8f48 (patch) | |
| tree | 1000dcd5a055a6d1eefaa9413d0bd428f350d6a6 /lib/private/legacy/util.php | |
| parent | 1cfc59c3ad4be637dcfc5e80cc96491d25d2e84d (diff) | |
| download | nextcloud-server-22fa6421e5d6751d707c28fe742901534a8c8f48.tar.gz nextcloud-server-22fa6421e5d6751d707c28fe742901534a8c8f48.zip | |
Prevent faulty logs from nested setupFS calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/legacy/util.php')
| -rw-r--r-- | lib/private/legacy/util.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 9bada5bb733..810f22fb9e5 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -204,7 +204,7 @@ class OC_Util { \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) { if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) { /** @var \OC\Files\Storage\Common $storage */ @@ -279,7 +279,8 @@ class OC_Util { }); 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 $objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null); |