upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #2615 from nextcloud/daita-sharecontroller

Browse source 
Download a file in a subfolder in a sharedlink is not working
This commit is contained in:
Lukas Reschke 2016-12-12 18:28:06 +01:00 committed by GitHub
commit e49088315e
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/Controller/ShareController.php
View file

@ -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());
@ -541,10 +541,11 @@ class ShareController extends Controller {
*
* @param Share\IShare $share
* @param array $files_list
* @param \OCP\Files\Folder $node
*/
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);
}