diff --git a/Classes/.DS_Store b/Classes/.DS_Store deleted file mode 100644 index db77f4d3..00000000 Binary files a/Classes/.DS_Store and /dev/null differ diff --git a/Classes/Backend/.DS_Store b/Classes/Backend/.DS_Store deleted file mode 100644 index 78f07bb7..00000000 Binary files a/Classes/Backend/.DS_Store and /dev/null differ diff --git a/Classes/Backend/EventListener/FlexForm/FlexformEvent.php b/Classes/Backend/EventListener/FlexForm/FlexformEvent.php index ca30781f..ce97db23 100644 --- a/Classes/Backend/EventListener/FlexForm/FlexformEvent.php +++ b/Classes/Backend/EventListener/FlexForm/FlexformEvent.php @@ -34,11 +34,7 @@ public function __invoke(AfterFlexFormDataStructureParsedEvent $event): void $dataStructure = $event->getDataStructure(); $identifier = $event->getIdentifier(); - if (!empty($settings['sitepackage'])) { - $ffPath = 'EXT:t3sb_package/T3SB/FlexForms/'; - } else { - $ffPath = '/fileadmin/T3SB/FlexForms/'; - } + $ffPath = Environment::getPublicPath() . '/fileadmin/T3SB/FlexForms/'; foreach ($GLOBALS['TCA']['tt_content']['columns']['tx_t3sbootstrap_flexform']['config']['ds'] as $key=>$flexForm) { $flexForms[$key] = substr($flexForm, 46, -4); @@ -47,7 +43,7 @@ public function __invoke(AfterFlexFormDataStructureParsedEvent $event): void if (array_key_exists($identifier['dataStructureKey'], $flexForms)) { if ($identifier['type'] === 'tca' && $identifier['tableName'] === 'tt_content' && $identifier['fieldName'] === 'tx_t3sbootstrap_flexform' && $identifier['dataStructureKey']) { - $file = Environment::getPublicPath() . $ffPath.$flexForms[$identifier['dataStructureKey']].'.xml'; + $file = $ffPath.$flexForms[$identifier['dataStructureKey']].'.xml'; if (file_exists($file)) { $content = @file_get_contents($file); if ($content) { diff --git a/Classes/Backend/Preview/DefaultPreviewRenderer.php b/Classes/Backend/Preview/DefaultPreviewRenderer.php index ec33f117..718fc933 100644 --- a/Classes/Backend/Preview/DefaultPreviewRenderer.php +++ b/Classes/Backend/Preview/DefaultPreviewRenderer.php @@ -143,7 +143,16 @@ public function renderPageModulePreviewHeader(GridColumnItem $item): string } if (!empty($flexconfSettings)) { - $flexconfSettings = '