diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-06 10:57:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 10:57:16 +0300 |
| commit | 392610e3c6dd45de73790047d3151a309d72b1da (patch) | |
| tree | fad54b76d8452df10b75f397cfb5b72d5d994f06 | |
| parent | b2c87ae63fe32e46d372f6646dea18637a53761f (diff) | |
| parent | 6918ed9903256656701d63763a38d6efc5bc4b30 (diff) | |
Merge pull request #4154 from nextcloud/stable11-4153
[stable11] Fix upload of folders in Chrome
| -rw-r--r-- | apps/files/js/file-upload.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 508f341f737..8eec8e32a64 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -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; |