mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14762 from nextcloud/backport/14674/stable15 

[stable15] [app:files] Use current directory for hashing.
This commit is contained in:
Morris Jobke 2019-03-20 22:30:38 +01:00 committed by GitHub
parent 6fffd09a7c fad5424165
commit a5cbe94878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files/js/file-upload.js
View File

@ -34,12 +34,11 @@
OC.FileUpload = function(uploader, data) { OC.FileUpload = function(uploader, data) {
this.uploader = uploader; this.uploader = uploader;
this.data = data; this.data = data;
var path = ''; var basePath = '';
if (this.uploader.fileList) { if (this.uploader.fileList) {
path = OC.joinPaths(this.uploader.fileList.getCurrentDirectory(), this.getFile().name); basePath = this.uploader.fileList.getCurrentDirectory();
} else {
path = this.getFile().name;
} }
var path = OC.joinPaths(basePath, this.getFile().relativePath || '', this.getFile().name);
this.id = 'web-file-upload-' + md5(path) + '-' + (new Date()).getTime(); this.id = 'web-file-upload-' + md5(path) + '-' + (new Date()).getTime();
}; };
OC.FileUpload.CONFLICT_MODE_DETECT = 0; OC.FileUpload.CONFLICT_MODE_DETECT = 0;