[BUGFIX] Fix content type registration for record-based CTypes

MaxGTR · Oct 24, 2022 · 851e24e · 851e24e
1 parent bf6ae95
commit 851e24e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/Classes/Content/ContentTypeManager.php b/Classes/Content/ContentTypeManager.php
@@ -34,7 +34,7 @@ class ContentTypeManager implements SingletonInterface
     const CACHE_TAG = 'content_types';
 
     /**
-     * @var ContentTypeDefinitionInterface[]
+     * @var ContentTypeDefinitionInterface[]|null[]
      */
     protected $types = [];
 
@@ -83,11 +83,7 @@ public function registerTypeDefinition(ContentTypeDefinitionInterface $typeDefin
 
     public function determineContentTypeForTypeString(string $contentTypeName): ?ContentTypeDefinitionInterface
     {
-        $definition = $this->loadSingleDefinitionFromCache($contentTypeName);
-        if ($definition === null) {
-            return null;
-        }
-        return $this->types[$contentTypeName] ?? ($this->types[$contentTypeName] = $definition);
+        return $this->types[$contentTypeName] ?? ($this->types[$contentTypeName] = $this->loadSingleDefinitionFromCache($contentTypeName));
     }
 
     public function determineContentTypeForRecord(array $record): ?ContentTypeDefinitionInterface
@@ -99,7 +95,7 @@ protected function loadSingleDefinitionFromCache(string $name): ?ContentTypeDefi
     {
         try {
             /** @var ContentTypeDefinitionInterface|null $fromCache */
-            $fromCache = $this->getCache()->get(static::CACHE_IDENTIFIER_PREFIX . $name);
+            $fromCache = $this->getCache()->get(static::CACHE_IDENTIFIER_PREFIX . $name) ?: null;
             return $fromCache;
         } catch (NoSuchCacheException $error) {
             return null;

diff --git a/Classes/Integration/ContentTypeBuilder.php b/Classes/Integration/ContentTypeBuilder.php
@@ -198,7 +198,7 @@ protected function addIcon(Form $form, string $contentType): string
             return $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes'][$contentType];
         }
         $icon = MiscellaneousUtility::getIconForTemplate($form);
-        if ($icon !== null) {
+        if (!empty($icon)) {
             if (strpos($icon, 'EXT:') === 0 || $icon[0] !== '/') {
                 $icon = GeneralUtility::getFileAbsFileName($icon);
             }

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -24,11 +24,6 @@
     ]
 );
 
-// Initialize the TCA needed by "template as CType" integrations
-\FluidTYPO3\Flux\Integration\HookSubscribers\TableConfigurationPostProcessor::spoolQueuedContentTypeTableConfigurations(
-    \FluidTYPO3\Flux\Core::getQueuedContentTypeRegistrations()
-);
-
 $GLOBALS['TCA']['tt_content']['columns']['colPos']['config']['itemsProcFunc'] =
     \FluidTYPO3\Flux\Integration\Overrides\BackendLayoutView::class . '->colPosListItemProcFunc';
 $GLOBALS['TCA']['tt_content']['columns']['pi_flexform']['label'] = 'LLL:EXT:flux/Resources/Private/Language/locallang.xlf:tt_content.pi_flexform';
@@ -48,3 +43,8 @@
         $contentType->getProviderClassName()
     );
 }
+
+// Initialize the TCA needed by "template as CType" integrations
+\FluidTYPO3\Flux\Integration\HookSubscribers\TableConfigurationPostProcessor::spoolQueuedContentTypeTableConfigurations(
+    \FluidTYPO3\Flux\Core::getQueuedContentTypeRegistrations()
+);