summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-20 19:01:05 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-20 19:01:05 +0200
commitd5819a5ecd26d4c7753f9c9fd0805ef83419cb0a (patch)
tree74053766aefc5e7b2a0a96c60050aef1581de95a /apps/files_sharing
parentca96b9d3d5197da9d2686c8fe8e0cdcc2fbfa800 (diff)
parent8ae2468345d5c5a090098a7477121f71992abaa0 (diff)
downloadnextcloud-server-d5819a5ecd26d4c7753f9c9fd0805ef83419cb0a.tar.gz
nextcloud-server-d5819a5ecd26d4c7753f9c9fd0805ef83419cb0a.zip
Merge pull request #9108 from owncloud/uploadintofolderfix
Fix many issues with drag and drop upload
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/js/public.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 80631908d24..1d633a655d5 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -128,7 +128,7 @@ OCA.Sharing.PublicApp = {
data.formData = {
requesttoken: $('#publicUploadRequestToken').val(),
dirToken: $('#dirToken').val(),
- subdir: self.fileList.getCurrentDirectory(),
+ subdir: data.targetDir || self.fileList.getCurrentDirectory(),
file_directory: fileDirectory
};
});