opensourcemirror
/
nextcloud-gallery
mirror of https://github.com/nextcloud/gallery.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Suggested changes from nickvergessen 

Signed-off-by: Thomas Anderson <me@thomasanderson.cloud>
This commit is contained in:
Thomas Anderson 2019-06-27 22:38:54 -04:00
parent 2d26d2b632
commit 51279a8f5c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Service/FilesService.php
View File

@ -29,7 +29,7 @@ abstract class FilesService extends Service {
/** @var string[] */
protected $features;
/** @var string[] */
protected $ignoreAlbumStrings = array('.nomedia', '.noimage');
protected $ignoreAlbumStrings = ['.nomedia', '.noimage'];
/**
* Retrieves all files and sub-folders contained in a folder
@ -141,19 +141,15 @@ abstract class FilesService extends Service {
* @return array|Folder
*/
protected function getAllowedSubFolder($node, $nodeType) {
$ignored = false;
if ($nodeType === 'dir') {
/** @var Folder $node */
try {
foreach ($this->ignoreAlbumStrings as $ignoreAlbum) {
if ($node->nodeExists($ignoreAlbum)) {
$ignored = true;
break;
return [];
}
}
if (!$ignored) {
return [$node];
}
return [$node];
} catch (StorageNotAvailableException $e) {
return [];
}