Merge pull request #22517 from nextcloud/external-mount-id-before-wrapper

icewind1991 · web-flow · commit 6b9b88f8b764 · 2020-08-31T15:19:51.000Z
set the mount id before calling storage wrapper
diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
@@ -102,6 +102,7 @@ public function __construct($storage, $mountpoint, $arguments = null, $loader =
 
 		$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);
@@ -113,7 +114,6 @@ public function __construct($storage, $mountpoint, $arguments = null, $loader =
 			$this->class = $storage;
 			$this->arguments = $arguments;
 		}
-		$this->mountId = $mountId;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public function __construct($storage, $mountpoint, $arguments = null, $loader =`
`102`	`102`
`103`	`103`	`$mountpoint = $this->formatPath($mountpoint);`
`104`	`104`	`$this->mountPoint = $mountpoint;`
	`105`	`+ $this->mountId = $mountId;`
`105`	`106`	`if ($storage instanceof Storage) {`
`106`	`107`	`$this->class = get_class($storage);`
`107`	`108`	`$this->storage = $this->loader->wrap($this, $storage);`
`@@ -113,7 +114,6 @@ public function __construct($storage, $mountpoint, $arguments = null, $loader =`
`113`	`114`	`$this->class = $storage;`
`114`	`115`	`$this->arguments = $arguments;`
`115`	`116`	`}`
`116`		`- $this->mountId = $mountId;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`/**`