Merge pull request #22518 from nextcloud/backport/22517/stable18

[stable18] set the mount id before calling storage wrapper
This commit is contained in:
Roeland Jago Douma 2020-09-01 08:05:15 +02:00 committed by GitHub
commit f9fb6caaae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -101,6 +101,7 @@ class MountPoint implements IMountPoint {
$mountpoint = $this->formatPath($mountpoint);
$this->mountPoint = $mountpoint;
$this->mountId = $mountId;
if ($storage instanceof Storage) {
$this->class = get_class($storage);
$this->storage = $this->loader->wrap($this, $storage);
@ -112,7 +113,6 @@ class MountPoint implements IMountPoint {
$this->class = $storage;
$this->arguments = $arguments;
}
$this->mountId = $mountId;
}
/**