From 7cdc3ddbc44d35a5e4c3a01893f42884e609c6fb Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Sun, 30 Jul 2023 10:33:51 +0200 Subject: [PATCH] [BUGFIX] Avoid skipping ext_typoscript_* files in TS parser A stupid return vs. continue issue breaks a loop in SysTemplateTreeBuilder early, which leads to `ext_typoscript_[setup|constants].typoscript` not being considered when they have been partially cached already. Resolves: #101407 Related: #97816 Releases: main, 12.4 Change-Id: Ia96bfd10a0f2998b1baa1c5a153417b424ba05a2 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80220 Tested-by: core-ci Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn --- .../Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typo3/sysext/core/Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php b/typo3/sysext/core/Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php index 522a3575ce9c..e02746c85c38 100644 --- a/typo3/sysext/core/Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php +++ b/typo3/sysext/core/Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php @@ -371,7 +371,7 @@ private function addExtensionStatics(IncludeInterface $parentNode): void $node = $this->cache->require($identifier); if ($node) { $parentNode->addChild($node); - return; + continue; } } $fileContent = file_get_contents($file);