diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2019-06-21 12:00:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 12:00:22 +0200 |
| commit | 9d121985dc2980ca9c3b4a69d807926d2424757d (patch) | |
| tree | ea48b490305b9b118876830ca7f98c22b3373d4a /lib | |
| parent | c1eff72bdf91df623bb377967270befd5c1594f9 (diff) | |
| parent | 22fa6421e5d6751d707c28fe742901534a8c8f48 (diff) | |
| download | nextcloud-server-9d121985dc2980ca9c3b4a69d807926d2424757d.tar.gz nextcloud-server-9d121985dc2980ca9c3b4a69d807926d2424757d.zip | |
Merge pull request #15540 from nextcloud/bugfix/noid/prevent-faulty-logs-from-nested-setupFS-calls
Prevent faulty logs from nested setupFS calls
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 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); |