diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-06 09:56:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 09:56:41 +0200 |
| commit | 287bae8c5ffd0cba66f2bc0b1f24b1011dbebea0 (patch) | |
| tree | c2f30984bbdf51c63538798788f00ba005552403 /apps/files | |
| parent | b084ceec3d8635b1e91d9db5e640a3016efc88b2 (diff) | |
| parent | 6e72fd5f9f9b816f562a4a2c5ae766d2d336263b (diff) | |
| download | nextcloud-server-287bae8c5ffd0cba66f2bc0b1f24b1011dbebea0.tar.gz nextcloud-server-287bae8c5ffd0cba66f2bc0b1f24b1011dbebea0.zip | |
Merge pull request #4153 from nextcloud/fix-upload
Fix upload of folders in Chrome
Diffstat (limited to 'apps/files')
| -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 bfb88bc5d20..75d9d0ebdfc 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -537,7 +537,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; |