From 329eb7c2b1d72a6502e6c0daa78bd9e30254f4ea Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 13 Mar 2014 23:34:42 +0100 Subject: [ticket/12268] Use FilesystemIterator::SKIP_DOTS PHPBB3-12268 --- phpBB/phpbb/extension/finder.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/extension/finder.php b/phpBB/phpbb/extension/finder.php index fd19436c16..4fb46c6ffd 100644 --- a/phpBB/phpbb/extension/finder.php +++ b/phpBB/phpbb/extension/finder.php @@ -475,15 +475,19 @@ class finder } $directory_pattern = '#' . $directory_pattern . '#'; - $iterator = new \phpbb\extension\recursive_filter_iterator(new \RecursiveDirectoryIterator($path)); - $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST); + $iterator = new \RecursiveIteratorIterator( + new \phpbb\extension\recursive_filter_iterator( + new \RecursiveDirectoryIterator( + $path, + \FilesystemIterator::SKIP_DOTS + ) + ), + \RecursiveIteratorIterator::SELF_FIRST + ); + foreach ($iterator as $file_info) { $filename = $file_info->getFilename(); - if ($filename == '.' || $filename == '..') - { - continue; - } if ($file_info->isDir() == $is_dir) { -- cgit v1.2.1