From 0ecaf8e6023622393090c1f2ff4c728c96eb2718 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 Sep 2016 12:44:49 +0200 Subject: Fix special characters when renaming to a conflict Signed-off-by: Joas Schilling --- apps/files/js/filelist.js | 4 +++- apps/files/js/newfilemenu.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'apps/files') diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 0e842cc7a74..98d0f132ad6 100644 --- 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 index f6cf87a55bf..75c4cdcc0ba 100644 --- 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; } -- cgit v1.2.3