Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 5.4:
  Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
  • Loading branch information
fabpot committed Jul 31, 2023
2 parents 78ce4c2 + ff4bce3 commit 9915db2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Iterator/ExcludeDirectoryFilterIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(\Iterator $iterator, array $directories)
*/
public function accept(): bool
{
if (isset($this->excludedDirs[$this->getFilename()]) && $this->hasChildren()) {
if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
return false;
}

Expand Down

0 comments on commit 9915db2

Please sign in to comment.