From 9ddb3cb19a7ea4b5c3ab2b411c0f936fcf777842 Mon Sep 17 00:00:00 2001
From: Mathias Schreiber <mathias.schreiber@typo3.org>
Date: Thu, 19 Oct 2017 01:13:52 +0200
Subject: [PATCH] [BUGFIX] Allow longer file-endings in typoscript directory
includes
Directory includes now allow more liberal substrings to include files
not only based on their extension (*.typoscript) but based on the last
part of their filename (*.setup.typoscript).
Resolves: #82543
Releases: master, 8.7
Change-Id: Ic2111b98a6e3935b542addfd712f4256aa40f888
Reviewed-on: https://review.typo3.org/54443
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benjamin Kott <benjamin.kott@outlook.com>
Tested-by: Benjamin Kott <benjamin.kott@outlook.com>
---
.../core/Classes/Utility/GeneralUtility.php | 21 +++++++++++--------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 716710f4efd9..ac6669255f07 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -2225,6 +2225,7 @@ class GeneralUtility
}
$pathPrefix = $path . '/';
+ $allowedFileExtensionArray = self::trimExplode(',', $extensionList);
$extensionList = ',' . str_replace(' ', '', $extensionList) . ',';
$files = [];
foreach ($rawFileList as $entry) {
@@ -2233,15 +2234,17 @@ class GeneralUtility
continue;
}
- if (
- ($extensionList === ',,' || stripos($extensionList, ',' . pathinfo($entry, PATHINFO_EXTENSION) . ',') !== false)
- && ($excludePattern === '' || !preg_match(('/^' . $excludePattern . '$/'), $entry))
- ) {
- if ($order !== 'mtime') {
- $files[] = $entry;
- } else {
- // Store the value in the key so we can do a fast asort later.
- $files[$entry] = filemtime($completePathToEntry);
+ foreach ($allowedFileExtensionArray as $allowedFileExtension) {
+ if (
+ ($extensionList === ',,' || stripos($extensionList, ',' . substr($entry, strlen($allowedFileExtension)*-1, strlen($allowedFileExtension)) . ',') !== false)
+ && ($excludePattern === '' || !preg_match(('/^' . $excludePattern . '$/'), $entry))
+ ) {
+ if ($order !== 'mtime') {
+ $files[] = $entry;
+ } else {
+ // Store the value in the key so we can do a fast asort later.
+ $files[$entry] = filemtime($completePathToEntry);
+ }
}
}
}
--
GitLab