summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorFelix Heidecke <felix@heidecke.me>2017-02-13 16:51:23 +0100
committerMorris Jobke <hey@morrisjobke.de>2017-03-20 01:17:12 -0600
commit11f838f9e4302154ebbcf5bad51faca4a0e28607 (patch)
tree72a13b9d43c94114ee2765cd630df00ee825bb7d /lib/private
parent528a903a7b23ea628e6ec2fc9a221821297c0bec (diff)
downloadnextcloud-server-11f838f9e4302154ebbcf5bad51faca4a0e28607.tar.gz
nextcloud-server-11f838f9e4302154ebbcf5bad51faca4a0e28607.zip
Add ignore_files to config,
test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Template/JSConfigHelper.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 6bf08dcdada..ca45bbee9c6 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -209,6 +209,7 @@ class JSConfigHelper {
'modRewriteWorking' => ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
'sharing.maxAutocompleteResults' => intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0)),
'sharing.minSearchStringLength' => intval($this->config->getSystemValue('sharing.minSearchStringLength', 0)),
+ 'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
]),
"oc_appconfig" => json_encode([
'core' => [