summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-25 16:58:00 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-25 16:58:00 +0100
commit3772a8acdb611b441bf2ea4fa3e0a37110a9d69f (patch)
treeec2c147db950f972f2b451328355604c1f5eeea4
parent776d91f3bc9ab0b281540f469b4f60f8d43ced03 (diff)
parentf338329ddf925ab5fa3c489f55650a865db6db97 (diff)
downloadnextcloud-server-3772a8acdb611b441bf2ea4fa3e0a37110a9d69f.tar.gz
nextcloud-server-3772a8acdb611b441bf2ea4fa3e0a37110a9d69f.zip
Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
-rw-r--r--apps/files_sharing/lib/external/mountprovider.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/external/mountprovider.php b/apps/files_sharing/lib/external/mountprovider.php
index 0bef3539c42..67d85f27d81 100644
--- a/apps/files_sharing/lib/external/mountprovider.php
+++ b/apps/files_sharing/lib/external/mountprovider.php
@@ -49,12 +49,13 @@ class MountProvider implements IMountProvider {
}
public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
- $data['manager'] = $this;
+ $managerProvider = $this->managerProvider;
+ $manager = $managerProvider();
+ $data['manager'] = $manager;
$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
$data['mountpoint'] = $mountPoint;
$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
- $managerProvider = $this->managerProvider;
- return new Mount(self::STORAGE, $mountPoint, $data, $managerProvider(), $storageFactory);
+ return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
}
public function getMountsForUser(IUser $user, IStorageFactory $loader) {