diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-18 23:38:14 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-18 23:38:14 +0100 |
| commit | 75e8b39826c9278288b8dc02dc19f0ca060080b6 (patch) | |
| tree | dcb2081b7b8779333d11b3adbf03d6b2c0ea4c76 /apps/files_trashbin | |
| parent | 891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b (diff) | |
| parent | 2eab0f21211762869db74891c2e2611f96bfef15 (diff) | |
| download | nextcloud-server-75e8b39826c9278288b8dc02dc19f0ca060080b6.tar.gz nextcloud-server-75e8b39826c9278288b8dc02dc19f0ca060080b6.zip | |
Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/helper.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index c99662480df..d9e69b71aa0 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -31,8 +31,10 @@ class Helper return $result; } - list($storage, $internalPath) = $view->resolvePath($dir); + $mount = $view->getMount($dir); + $storage = $mount->getStorage(); $absoluteDir = $view->getAbsolutePath($dir); + $internalPath = $mount->getInternalPath($absoluteDir); if (is_resource($dirContent)) { $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user); @@ -65,7 +67,7 @@ class Helper if ($originalPath) { $i['extraData'] = $originalPath.'/'.$id; } - $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i); + $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount); } } closedir($dirContent); |