From cf3cd3d2d1b41dd8808bcca5fbea974cc70495eb Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 9 Sep 2016 10:40:16 +0300 Subject: [PATCH] Follow symlinks in `Folder::all()` --- CHANGELOG.md | 1 + composer.lock | 8 ++++---- system/src/Grav/Common/Filesystem/Folder.php | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c3665fc4..4f97aed9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 1. [](#improved) * Refactored `onPageNotFound` event to fire after `onPageInitialized` + * Follow symlinks in `Folder::all()` 1. [](#bugfix) * Quietly skip missing streams in `Cache::clearCache()` diff --git a/composer.lock b/composer.lock index afc4d23c8..13c2696ba 100644 --- a/composer.lock +++ b/composer.lock @@ -794,12 +794,12 @@ "source": { "type": "git", "url": "https://github.com/rockettheme/toolbox.git", - "reference": "327db9748b112c2c2c843f931e1ad88659fc8482" + "reference": "352ce81c373ccb9a9c4b1ea5de0c10b95e54d7f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/327db9748b112c2c2c843f931e1ad88659fc8482", - "reference": "327db9748b112c2c2c843f931e1ad88659fc8482", + "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/352ce81c373ccb9a9c4b1ea5de0c10b95e54d7f2", + "reference": "352ce81c373ccb9a9c4b1ea5de0c10b95e54d7f2", "shasum": "" }, "require": { @@ -834,7 +834,7 @@ "php", "rockettheme" ], - "time": "2016-08-25 23:28:38" + "time": "2016-09-09 07:27:11" }, { "name": "seld/cli-prompt", diff --git a/system/src/Grav/Common/Filesystem/Folder.php b/system/src/Grav/Common/Filesystem/Folder.php index b43fada7c..c7170e973 100644 --- a/system/src/Grav/Common/Filesystem/Folder.php +++ b/system/src/Grav/Common/Filesystem/Folder.php @@ -179,7 +179,8 @@ abstract class Folder /** @var UniformResourceLocator $locator */ $locator = Grav::instance()['locator']; if ($recursive) { - $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS + \FilesystemIterator::CURRENT_AS_SELF; + $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS + + \FilesystemIterator::CURRENT_AS_SELF + \FilesystemIterator::FOLLOW_SYMLINKS; if ($locator->isStream($path)) { $directory = $locator->getRecursiveIterator($path, $flags); } else {