summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-03-15 08:25:13 -0700
committerBernhard Posselt <nukeawhale@gmail.com>2013-03-15 08:25:13 -0700
commitebb2cb340349929e5e1d8e73e0f4523756f69d73 (patch)
tree12bfaaaf5a0a0062213b7a585fd4fffb4146572c
parent761540e78b5e7ffc6cf717c71adcd8378b8f13a8 (diff)
parent387be374270dc1ac3669325fee60d35889a85b6e (diff)
downloadnextcloud-server-ebb2cb340349929e5e1d8e73e0f4523756f69d73.tar.gz
nextcloud-server-ebb2cb340349929e5e1d8e73e0f4523756f69d73.zip
Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files
Filter display of blacklisted files
-rw-r--r--lib/files/cache/scanner.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 88f208547f6..f285f3bed11 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -151,6 +151,7 @@ class Scanner {
private function isIgnoredFile($file) {
if ($file === '.' || $file === '..'
|| pathinfo($file, PATHINFO_EXTENSION) === 'part'
+ || \OC\Files\Filesystem::isFileBlacklisted($file)
) {
return true;
}