[BUGFIX] Drop usage of iconFile if typeicon_classes is used in TCA 42/44042/2
authorGeorg Ringer <georg.ringer@gmail.com>
Wed, 14 Oct 2015 08:25:30 +0000 (10:25 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 15 Oct 2015 06:24:30 +0000 (08:24 +0200)
If typeicon_classes is used, the iconFile is not required.

Furthermore using an icon identifier instead of a file in iconFile
triggers an entry in the deprecation log and a wrong TCA migration.

The identifiers are not used anywhere else and can be removed in the
IconRegistry.

Change-Id: Ib6df3566e9b23d59cab730cc1246affe84891929
Resolves: #70678
Releases: master
Reviewed-on: http://review.typo3.org/44042
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/core/Classes/Imaging/IconRegistry.php
typo3/sysext/frontend/Configuration/TCA/sys_domain.php
typo3/sysext/frontend/Configuration/TCA/sys_template.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php

index c16f28f..099c628 100644 (file)
@@ -1772,31 +1772,6 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface
                 'source' => 'EXT:core/Resources/Public/Icons/Flags/wales.png'
             )
         ),
-
-        'tcarecords-sys_domain-default' => array(
-            'provider' => SvgIconProvider::class,
-            'options' => array(
-                'source' => 'EXT:backend/Resources/Public/Icons/Overlay/overlay-translated.svg'
-            )
-        ),
-        'tcarecords-sys_template-default' => array(
-            'provider' => BitmapIconProvider::class,
-            'options' => array(
-                'source' => 'EXT:t3skin/images/icons/mimetypes/x-content-template.png'
-            )
-        ),
-        'tcarecords-sys_workspace-default' => array(
-            'provider' => BitmapIconProvider::class,
-            'options' => array(
-                'source' => 'EXT:t3skin/images/icons/mimetypes/x-sys_workspace.png'
-            )
-        ),
-        'tcarecords-sys_workspace_stage-default' => array(
-            'provider' => BitmapIconProvider::class,
-            'options' => array(
-                'source' => 'EXT:t3skin/images/icons/mimetypes/x-sys_workspace.png'
-            )
-        ),
     );
 
     /**
index 17f849f..be52b13 100644 (file)
@@ -7,7 +7,6 @@ return array(
         'cruser_id' => 'cruser_id',
         'sortby' => 'sorting',
         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:sys_domain',
-        'iconfile' => 'tcarecords-sys_domain-default',
         'enablecolumns' => array(
             'disabled' => 'hidden'
         ),
index b43a1bf..b631f01 100644 (file)
@@ -12,9 +12,8 @@ return array(
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
         'delete' => 'deleted',
-        'adminOnly' => 1,
         // Only admin, if any
-        'iconfile' => 'tcarecords-sys_template-default',
+        'adminOnly' => 1,
         'enablecolumns' => array(
             'disabled' => 'hidden',
             'starttime' => 'starttime',
index 9696b30..02722b9 100644 (file)
@@ -7,7 +7,6 @@ return array(
         'adminOnly' => 1,
         'rootLevel' => 1,
         'delete' => 'deleted',
-        'iconfile' => 'mimetypes-x-sys_workspace',
         'typeicon_classes' => array(
             'default' => 'mimetypes-x-sys_workspace'
         ),
index b087fc5..a0181f6 100644 (file)
@@ -9,7 +9,6 @@ return array(
         'rootLevel' => 1,
         'hideTable' => true,
         'delete' => 'deleted',
-        'iconfile' => 'mimetypes-x-sys_workspace',
         'typeicon_classes' => array(
             'default' => 'mimetypes-x-sys_workspace'
         ),