From 9ef8d25e4620d818c582db4ba1f26bf1fa83d36f Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Sun, 11 Dec 2016 18:32:28 -0100 Subject: Download a file in a subfolder in a sharedlink is not working the $node created using the path (GET) parameter is not used when executing fileListDownloaded() --- apps/files_sharing/lib/Controller/ShareController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/files_sharing/lib/Controller/ShareController.php') diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 3b86f7dc23b..583fb215d61 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -487,7 +487,7 @@ class ShareController extends Controller { // Single file download $this->singleFileDownloaded($share, $share->getNode()); } else if (!empty($files_list)) { - $this->fileListDownloaded($share, $files_list); + $this->fileListDownloaded($share, $files_list, $node); } else { // The folder is downloaded $this->singleFileDownloaded($share, $share->getNode()); @@ -542,9 +542,9 @@ class ShareController extends Controller { * @param Share\IShare $share * @param array $files_list */ - protected function fileListDownloaded(Share\IShare $share, array $files_list) { + protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) { foreach ($files_list as $file) { - $subNode = $share->getNode()->get($file); + $subNode = $node->get($file); $this->singleFileDownloaded($share, $subNode); } -- cgit v1.2.3