diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-03 16:47:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:47:20 +0200 |
| commit | 62d5daa94f3bbb8cdec8a799b4f3d8178f34ec92 (patch) | |
| tree | 40f9d10a17a2d94fcc85f8db6d02e30af1c77776 /apps | |
| parent | 08b0e5c1126e9c9a45abc4c8b53e1efd437c1759 (diff) | |
| parent | 0ecaf8e6023622393090c1f2ff4c728c96eb2718 (diff) | |
| download | nextcloud-server-62d5daa94f3bbb8cdec8a799b4f3d8178f34ec92.tar.gz nextcloud-server-62d5daa94f3bbb8cdec8a799b4f3d8178f34ec92.zip | |
Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-name-conflict
Fix special characters when renaming to a conflict
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 4 |
2 files changed, 6 insertions, 2 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; 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; } |