diff --git a/typo3_src-6.2.15/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3_src-6.2.15/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php index d68553c..ad2ff90 100644 --- a/typo3_src-6.2.15/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php +++ b/typo3_src-6.2.15/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php @@ -471,7 +471,8 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver { if ($recursive) { $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($path, $iteratorMode), - \RecursiveIteratorIterator::SELF_FIRST + \RecursiveIteratorIterator::SELF_FIRST, + \RecursiveIteratorIterator::CATCH_GET_CHILD ); } else { $iterator = new \RecursiveDirectoryIterator($path, $iteratorMode); @@ -899,7 +900,8 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver { /** @var $iterator \RecursiveDirectoryIterator */ $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($sourceFolderPath), - \RecursiveIteratorIterator::SELF_FIRST + \RecursiveIteratorIterator::SELF_FIRST, + \RecursiveIteratorIterator::CATCH_GET_CHILD ); // Rewind the iterator as this is important for some systems e.g. Windows $iterator->rewind(); diff --git a/typo3_src-6.2.15/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php b/typo3_src-6.2.15/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php index 9a9fc73..e2f0e07 100644 --- a/typo3_src-6.2.15/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php +++ b/typo3_src-6.2.15/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php @@ -77,7 +77,11 @@ class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTa throw new \RuntimeException('Given directory "' . $directory . '" does not exist', 1301614535); } // Find all _recycler_ directories - $directoryContent = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory)); + $directoryContent = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($directory), + \RecursiveIteratorIterator::LEAVES_ONLY, + \RecursiveIteratorIterator::CATCH_GET_CHILD + ); foreach ($directoryContent as $fileName => $file) { // Skip directories and files without recycler directory in absolute path $filePath = $file->getPath();