diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-20 11:20:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 11:20:41 +0100 |
| commit | 69f18712ead12d02b63fb5af2cb8e02bab4dc2df (patch) | |
| tree | b51797ac03628f958174262c6b41f02703315fb8 | |
| parent | 6458dd841c174ff497c77cac655cdc60c49e0270 (diff) | |
| parent | de648f6a3e0025262155aeffa689738901a72dfc (diff) | |
| download | nextcloud-server-69f18712ead12d02b63fb5af2cb8e02bab4dc2df.tar.gz nextcloud-server-69f18712ead12d02b63fb5af2cb8e02bab4dc2df.zip | |
Merge pull request #14674 from CamilionEU/master
[app:files] Use current directory for hashing.
| -rw-r--r-- | apps/files/js/file-upload.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index a56668c493f..7681de9bf38 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -34,12 +34,11 @@ OC.FileUpload = function(uploader, data) { this.uploader = uploader; this.data = data; - var path = ''; + var basePath = ''; if (this.uploader.fileList) { - path = OC.joinPaths(this.uploader.fileList.getCurrentDirectory(), this.getFile().name); - } else { - path = this.getFile().name; + basePath = this.uploader.fileList.getCurrentDirectory(); } + var path = OC.joinPaths(basePath, this.getFile().relativePath || '', this.getFile().name); this.id = 'web-file-upload-' + md5(path) + '-' + (new Date()).getTime(); }; OC.FileUpload.CONFLICT_MODE_DETECT = 0; |