Merge pull request #159 from nextcloud/fix/75/hige_noimage_folders_in…

…_album_overview Respect .noimage and .nomedia files
nextcloud · Jan 27, 2020 · cec404e · cec404e
2 parents 85ea3ae + 5acd996
commit cec404e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
@@ -142,6 +142,11 @@ private function scanFolder(Folder $folder, int $depth, bool $shared): iterable
 			return [];
 		}
 
+		// Ignore folder with a .noimage or .nomedia node
+		if ($folder->nodeExists('.noimage') || $folder->nodeExists('.nomedia')) {
+			return [];
+		}
+
 		$nodes = $folder->getDirectoryListing();
 
 		foreach ($nodes as $node) {