[BUGFIX] Fix various TCA issues 37/44537/2
authorMarkus Klein <markus.klein@typo3.org>
Wed, 4 Nov 2015 14:39:12 +0000 (15:39 +0100)
committerAlexander Opitz <opitz.alexander@googlemail.com>
Wed, 4 Nov 2015 16:01:10 +0000 (17:01 +0100)
Get TCA right to not cause deprecation log entries.

Resolves: #71320
Releases: master
Change-Id: I0d4dd114123c97e352715021ccaefc16f8d0001d
Reviewed-on: https://review.typo3.org/44537
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
typo3/sysext/core/Classes/Migrations/TcaMigration.php
typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/frontend/Configuration/TCA/tt_content.php
typo3/sysext/t3editor/Configuration/TCA/Overrides/tt_content.php

index b3100ce..15c4f06 100644 (file)
@@ -52,7 +52,6 @@ abstract class AbstractSpriteHandler implements SpriteIconGeneratorInterface
      */
     public function __construct()
     {
-        GeneralUtility::deprecationLog(self::class . ' is deprecated since TYPO3 CMS 7, will be removed with TYPO3 CMS 8');
         // The file name is prefixed with "z" since the concatenator orders files per name
         $this->cssTcaFile = PATH_site . SpriteManager::$tempPath . 'zextensions.css';
         $this->styleSheetData = '/* Auto-Generated via ' . get_class($this) . ' */' . LF;
index ea73593..3b9c9f2 100644 (file)
@@ -585,9 +585,9 @@ class TcaMigration
                     continue;
                 }
                 if (!empty($fieldConfig['config']['selicon_cols'])) {
-                    $this->messages[] = 'The "showIconTable" setting is missing for table "' . $table . '" and field "' . $fieldName . '"';
                     // selicon_cols without showIconTable true does not make sense, so set it to true here if not already defined
                     if (!array_key_exists('showIconTable', $fieldConfig['config'])) {
+                        $this->messages[] = 'The "showIconTable" setting is missing for table "' . $table . '" and field "' . $fieldName . '"';
                         $fieldConfig['config']['showIconTable'] = true;
                     }
                 }
index 18789b5..6b1308e 100644 (file)
@@ -38,7 +38,7 @@ call_user_func(function () {
         'showitem' => '
                                --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
                                --palette--;' . $frontendLanguageFilePrefix . 'palette.header;header,
-                               bodytext;' . $frontendLanguageFilePrefix . 'bodytext_formlabel;;richtext:rte_transform[mode=ts_css],
+                               bodytext;' . $frontendLanguageFilePrefix . 'bodytext_formlabel,
                        --div--;' . $frontendLanguageFilePrefix . 'tabs.media,
                                assets,
                                --palette--;' . $frontendLanguageFilePrefix . 'palette.imagelinks;imagelinks,
@@ -52,6 +52,7 @@ call_user_func(function () {
                                --palette--;' . $frontendLanguageFilePrefix . 'palette.access;access,
                        --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
                ',
+        'columnsOverrides' => ['bodytext' => ['defaultExtras' => 'richtext:rte_transform[mode=ts_css]']]
     ];
 
     // Add category tab when categories column exits
index e66bd42..b4ce8fc 100644 (file)
@@ -1107,7 +1107,7 @@ return array(
             'showitem' => '
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
-                                       bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel;;nowrap,
+                                       bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel,
                                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
                                        layout;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:layout_formlabel,
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.appearanceLinks;appearanceLinks,
@@ -1115,7 +1115,8 @@ return array(
                                        hidden;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:field.default.hidden,
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
                                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended
-                       '
+                       ',
+            'columnsOverrides' => ['bodytext' => ['defaultExtras' => 'nowrap']]
         ),
         'div' => array(
             'showitem' => '
@@ -1147,7 +1148,7 @@ return array(
             'showitem' => '
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
                                        header;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header.ALT.html_formlabel,
-                                       bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.html_formlabel;;nowrap:wizards[t3editor],
+                                       bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.html_formlabel,
                                --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
                                        layout;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:layout_formlabel,
                                        --palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.appearanceLinks;appearanceLinks,
index 10d5506..ba3051a 100644 (file)
@@ -9,7 +9,7 @@ if (is_array($GLOBALS['TCA']['tt_content']['types']['html'])) {
     if (!is_array($GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext'])) {
         $GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext'] = array();
     }
-    $GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext']['defaultExtras'] = 'nowrap';
+    $GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext']['defaultExtras'] = 'nowrap:wizards[t3editor]';
     if (!is_array($GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext']['config'])) {
         $GLOBALS['TCA']['tt_content']['types']['html']['columnsOverrides']['bodytext']['config'] = array();
     }