From 24e6b6c8f1c498a742d793278ff2637a53a0eefc Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 4 Feb 2019 22:21:11 +0200 Subject: [PATCH] Fixed Flex from indexing hidden folders/files as objects --- CHANGELOG.md | 1 + system/src/Grav/Framework/Flex/Storage/FileStorage.php | 2 +- system/src/Grav/Framework/Flex/Storage/FolderStorage.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acab519ff..a46fa9df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ 1. [](#bugfix) * Fixed non-namespaced exceptions in scheduler * Fixed trailing slash redirect in multlang environment [#2350](https://github.com/getgrav/grav/issues/2350) + * Fixed Flex from indexing hidden folders/files as objects # v1.6.0-rc.1 ## 01/30/2019 diff --git a/system/src/Grav/Framework/Flex/Storage/FileStorage.php b/system/src/Grav/Framework/Flex/Storage/FileStorage.php index ac530ba83..f9f31cc28 100644 --- a/system/src/Grav/Framework/Flex/Storage/FileStorage.php +++ b/system/src/Grav/Framework/Flex/Storage/FileStorage.php @@ -61,7 +61,7 @@ class FileStorage extends FolderStorage $list = []; /** @var \SplFileInfo $info */ foreach ($iterator as $filename => $info) { - if (!$info->isFile() || !($key = $this->getKeyFromPath($filename))) { + if (!$info->isFile() || !($key = $this->getKeyFromPath($filename)) || strpos($info->getFilename(), '.') === 0) { continue; } diff --git a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php index e141a6d5c..9208ba878 100644 --- a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php +++ b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php @@ -407,7 +407,7 @@ class FolderStorage extends AbstractFilesystemStorage $list = []; /** @var \SplFileInfo $info */ foreach ($iterator as $filename => $info) { - if (!$info->isDir()) { + if (!$info->isDir() || strpos($info->getFilename(), '.') === 0) { continue; }