mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22644 from owncloud/external-share-manager 

inject the correct external share manager into the storage
This commit is contained in:
Thomas Müller 2016-02-25 16:58:00 +01:00
parent 776d91f3bc f338329ddf
commit 3772a8acdb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_sharing/lib/external/mountprovider.php vendored
View File

@ -49,12 +49,13 @@ class MountProvider implements IMountProvider {
} }
public function getMount(IUser $user, $data, IStorageFactory $storageFactory) { 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'], '/'); $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
$data['mountpoint'] = $mountPoint; $data['mountpoint'] = $mountPoint;
$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID()); $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
$managerProvider = $this->managerProvider; return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
return new Mount(self::STORAGE, $mountPoint, $data, $managerProvider(), $storageFactory);
} }
public function getMountsForUser(IUser $user, IStorageFactory $loader) { public function getMountsForUser(IUser $user, IStorageFactory $loader) {