diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 22:20:44 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 22:28:16 +0200 |
| commit | 3587c88fe946196af009d02db7c7d5e2c8934fe9 (patch) | |
| tree | a18ce4f6cb6acd08f082cb365f42f25a4b691c21 /apps/files/js/file-upload.js | |
| parent | be9bc2c727e59ced01f86bc1781ac586f92bc29f (diff) | |
| parent | 089052b13af7a5e27d225ab345616511f4eaf2a9 (diff) | |
| download | nextcloud-server-3587c88fe946196af009d02db7c7d5e2c8934fe9.tar.gz nextcloud-server-3587c88fe946196af009d02db7c7d5e2c8934fe9.zip | |
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index e5d1eacbd14..46a53208406 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -329,7 +329,8 @@ OC.Upload = { // noone set update parameters, we set the minimum data.formData = { requesttoken: oc_requesttoken, - dir: $('#dir').val() + dir: $('#dir').val(), + file_directory: data.files[0]['relativePath'] }; } }, @@ -683,3 +684,4 @@ $(document).ready(function() { OC.Upload.init(); }); + |