From 22fa6421e5d6751d707c28fe742901534a8c8f48 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 15 May 2019 10:22:51 +0200 Subject: [PATCH] Prevent faulty logs from nested setupFS calls Signed-off-by: Joas Schilling --- lib/private/legacy/util.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 9bada5bb73..810f22fb9e 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);