aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-07-13 10:56:16 +0200
committerGitHub <noreply@github.com>2020-07-13 10:56:16 +0200
commit7569bc15bdf0959f1ecc4461954c0dfab93053cf (patch)
treed0bb133a0c276618942248ca1d36ff06483cf370 /lib
parenta8cc99bd53710d4a49dd1ed13fa13c5434ad79c0 (diff)
parente357d46863e02bb896185fc4604d05e51f7b4422 (diff)
downloadnextcloud-server-7569bc15bdf0959f1ecc4461954c0dfab93053cf.tar.gz
nextcloud-server-7569bc15bdf0959f1ecc4461954c0dfab93053cf.zip
Merge pull request #21789 from nextcloud/ftp-filter-hash
filter files containing a hash in the path for ftp storages
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Common.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 6c57405619a..a62b7d727fb 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -876,7 +876,10 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file) && !Filesystem::isFileBlacklisted($file)) {
$childPath = $basePath . '/' . trim($file, '/');
- yield $this->getMetaData($childPath);
+ $metadata = $this->getMetaData($childPath);
+ if ($metadata !== null) {
+ yield $metadata;
+ }
}
}
}