upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-02 21:41:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-name-conflict

Browse source 
Fix special characters when renaming to a conflict
This commit is contained in:
Morris Jobke 2016-10-03 16:47:20 +02:00 committed by GitHub
commit 62d5daa94f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/js/filelist.js
View file

@ -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;

4
apps/files/js/newfilemenu.js
View file

@ -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;
}