Do not prevent subfolder uploads if same file exists in current direc…

…tory Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Mar 13, 2017 · 892660d · 892660d
1 parent f7cef9f
commit 892660d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -648,6 +648,12 @@ OC.Uploader.prototype = _.extend({
 				// no list to check against
 				return true;
 			}
+
+			// We cannot detect conflicts in other folders
+			if (fileList.getCurrentDirectory() !== upload.getTargetFolder()) {
+				return true;
+			}
+
 			var fileInfo = fileList.findFile(file.name);
 			if (fileInfo) {
 				conflicts.push([