Do not prevent subfolder uploads if same file exists in current directory

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Author: ChristophWurst

apps/files/js/file-upload.js

@@ -644,6 +644,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([