aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-29 17:24:28 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-04-06 00:50:58 -0500
commit6e72fd5f9f9b816f562a4a2c5ae766d2d336263b (patch)
treeea981cd46956b27c4cfc7157247751fe51e74438
parentd17678b5b2cb430a223d0053337de6fc7860d0bc (diff)
downloadnextcloud-server-6e72fd5f9f9b816f562a4a2c5ae766d2d336263b.tar.gz
nextcloud-server-6e72fd5f9f9b816f562a4a2c5ae766d2d336263b.zip
Fix upload of folders in Chrome
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--apps/files/js/file-upload.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index ad4d03a1bdb..1b85f578f43 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;