Merge pull request #20599 from nextcloud/getDirectoryContent-filter-b…

…lacklisted filter out blacklisted files in getDirectoryContent
nextcloud · Apr 23, 2020 · 7c6e77a · 7c6e77a
2 parents 3c2dd08 + 7a4ea4a
commit 7c6e77a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -48,7 +48,6 @@
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\Share\IShare;
-use OCP\Share;
 use OCP\Share\IManager;
 use function usort;
 

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -874,7 +874,7 @@ public function getDirectoryContent($directory): \Traversable {
 		if (is_resource($dh)) {
 			$basePath = rtrim($directory, '/');
 			while (($file = readdir($dh)) !== false) {
-				if (!Filesystem::isIgnoredDir($file)) {
+				if (!Filesystem::isIgnoredDir($file) && !Filesystem::isFileBlacklisted($file)) {
 					$childPath = $basePath . '/' . trim($file, '/');
 					yield $this->getMetaData($childPath);
 				}