diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:28:21 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:28:21 +0100 |
| commit | 07b3b23a39d3592602efea3ab6448178fb1b166a (patch) | |
| tree | b02c933bc673b3e0e41e096d464cc9c27ad32167 /apps/files/js/filelist.js | |
| parent | 7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77 (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-07b3b23a39d3592602efea3ab6448178fb1b166a.tar.gz nextcloud-server-07b3b23a39d3592602efea3ab6448178fb1b166a.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 33f35eee6c5..fc37e03ba49 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -149,7 +149,7 @@ var FileList={ event.stopPropagation(); event.preventDefault(); var newname=input.val(); - if (Files.containsInvalidCharacters(newname)) { + if (!Files.isFileNameValid(newname)) { return false; } if (newname != name) { |