diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-05-15 11:22:51 +0300 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-06-21 13:02:23 +0300 |
| commit | bad2e92c89c22fb74aa1f3c3d6c25eb52121a238 (patch) | |
| tree | f1d796e647bd8ec435e923c604a85b1d2c5bbf4b /lib | |
| parent | 5e1a2fe3fb85ab154c7f42c70c227592f41978fc (diff) | |
Prevent faulty logs from nested setupFS calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -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 7ab13716547..5b77f6d0614 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); |