upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge pull request #4154 from nextcloud/stable11-4153

Browse source 
[stable11] Fix upload of folders in Chrome
This commit is contained in:
Joas Schilling 2017-04-06 09:57:16 +02:00 committed by GitHub
commit 392610e3c6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files/js/file-upload.js
View file

@ -540,7 +540,8 @@ OC.Uploader.prototype = _.extend({
getUpload: function(data) {
if (_.isString(data)) {
return this._uploads[data];
} else if (data.uploadId) {
} else if (data.uploadId && this._uploads[data.uploadId]) {
this._uploads[data.uploadId].data = data;
return this._uploads[data.uploadId];
}
return null;