Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-n…

…ame-conflict Fix special characters when renaming to a conflict
nextcloud · Oct 3, 2016 · 62d5daa · 62d5daa
2 parents 08b0e5c + 0ecaf8e
commit 62d5daa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -1941,7 +1941,9 @@
 					// Files.isFileNameValid(filename) throws an exception itself
 					OCA.Files.Files.isFileNameValid(filename);
 					if (self.inList(filename)) {
-						throw t('files', '{newName} already exists', {newName: filename});
+						throw t('files', '{newName} already exists', {newName: filename}, undefined, {
+							escape: false
+						});
 					}
 				}
 				return true;

diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
@@ -146,7 +146,9 @@
 					if (!Files.isFileNameValid(filename)) {
 						// Files.isFileNameValid(filename) throws an exception itself
 					} else if (self.fileList.inList(filename)) {
-						throw t('files', '{newname} already exists', {newname: filename});
+						throw t('files', '{newName} already exists', {newName: filename}, undefined, {
+							escape: false
+						});
 					} else {
 						return true;
 					}