summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-10-30 21:29:04 +0100
committerGitHub <noreply@github.com>2017-10-30 21:29:04 +0100
commitc258cb5557507b3966990872669567af073f10f4 (patch)
tree523df12aeba757cca0879fcbbe8a4cf8a20f4ded /apps
parent5672f14fd1218945bd6d585d231554a8481525ae (diff)
parent638be96232e8e35345509ba6f6a83905a312a57a (diff)
downloadnextcloud-server-c258cb5557507b3966990872669567af073f10f4.tar.gz
nextcloud-server-c258cb5557507b3966990872669567af073f10f4.zip
Merge pull request #7016 from nextcloud/fix_6820
Do not error when downloading from a numeric public subfolder
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index ed9ad33417a..700ac220804 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -458,6 +458,10 @@ class ShareController extends Controller {
if ($files_list === null) {
$files_list = [$files];
}
+ // Just in case $files is a single int like '1234'
+ if (!is_array($files_list)) {
+ $files_list = [$files_list];
+ }
}
$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());