aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-11-23 16:20:56 +0100
committerRobin Appelman <icewind@owncloud.com>2012-11-23 16:20:56 +0100
commit555dec2d92316e47edd775d4e63ffe60fb0eca6b (patch)
tree7cde08c5ce382fae2acdd2434b208ca956d48ec8 /apps/files/js/filelist.js
parent95057e727d438098bec050baf997a7489563a04e (diff)
parent67f9f079ae848116d5eb4306d35456fe0e34f5e4 (diff)
downloadnextcloud-server-555dec2d92316e47edd775d4e63ffe60fb0eca6b.tar.gz
nextcloud-server-555dec2d92316e47edd775d4e63ffe60fb0eca6b.zip
merge master into filesystem
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a5550dc9926..5674206632b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -151,6 +151,9 @@ var FileList={
event.stopPropagation();
event.preventDefault();
var newname=input.val();
+ if (Files.containsInvalidCharacters(newname)) {
+ return false;
+ }
if (newname != name) {
if (FileList.checkName(name, newname, false)) {
newname = name;