summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-05-14 11:00:22 +0200
committerGitHub <noreply@github.com>2019-05-14 11:00:22 +0200
commitc41aa7a20929118ce1092c603f709d06aef1da57 (patch)
tree317025ae0355a448173a55d0f7fe7f8aa87f9bbb /apps
parentc2177caf52bb3bdfb95c474bea9d9f66f51d8796 (diff)
parent2f5df9387d30e33b3903c9ec99ae5661ac1819d8 (diff)
downloadnextcloud-server-c41aa7a20929118ce1092c603f709d06aef1da57.tar.gz
nextcloud-server-c41aa7a20929118ce1092c603f709d06aef1da57.zip
Merge pull request #15524 from nextcloud/refactor/oc-add-translations-bundle-deprecate
Deprecate OC.fileIsBlacklisted and move it to the bundle
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 38705e12ee2..abc85864fae 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -139,7 +139,7 @@
throw t('files', 'File name cannot be empty.');
} else if (trimmedName.indexOf('/') !== -1) {
throw t('files', '"/" is not allowed inside a file name.');
- } else if (OC.fileIsBlacklisted(trimmedName)) {
+ } else if (!!(trimmedName.match(OC.config.blacklist_files_regex))) {
throw t('files', '"{name}" is not an allowed filetype', {name: name});
}