aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-09-30 12:44:49 +0200
committerJoas Schilling <coding@schilljs.com>2016-09-30 12:44:49 +0200
commit0ecaf8e6023622393090c1f2ff4c728c96eb2718 (patch)
treeeeee7a37f31493a19b2492e1272f73ea83719c0a /apps/files/js/filelist.js
parent99076a8c0d1ab4b8666ab6adb859c47caaa9c7a2 (diff)
downloadnextcloud-server-0ecaf8e6023622393090c1f2ff4c728c96eb2718.tar.gz
nextcloud-server-0ecaf8e6023622393090c1f2ff4c728c96eb2718.zip
Fix special characters when renaming to a conflict
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js4
1 files changed, 3 insertions, 1 deletions
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;