From e2a4417079c2ddd1263ec9af2d2930eb65e911f7 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 10 Oct 2013 15:54:00 +0200 Subject: Fixed conflict dialog in IE8 - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run --- apps/files/js/file-upload.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index f1ef485fc3d..eb42d604ed3 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -124,7 +124,11 @@ OC.Upload = { */ onReplace:function(data){ this.log('replace', null, data); - data.data.append('resolution', 'replace'); + if (data.data){ + data.data.append('resolution', 'replace'); + } else { + data.formData.push({name:'resolution',value:'replace'}); //hack for ie8 + } data.submit(); }, /** -- cgit v1.2.3