From a7b33e8fb403820da0481ec11c0d3b8698499944 Mon Sep 17 00:00:00 2001
From: Nicole Cordes <typo3@cordes.co>
Date: Wed, 16 May 2018 15:08:19 +0200
Subject: [PATCH] [!!!][TASK] Remove contentElementIcons extension
 configuration

Always export icons for content elements.
---
 Classes/Aggregate/ContentElementIconAggregate.php            | 5 -----
 .../Controller/AbstractExportControllerTestCase.php          | 1 -
 ext_conf_template.txt                                        | 2 --
 3 files changed, 8 deletions(-)
 delete mode 100644 ext_conf_template.txt

diff --git a/Classes/Aggregate/ContentElementIconAggregate.php b/Classes/Aggregate/ContentElementIconAggregate.php
index f8e1112..157fbb1 100644
--- a/Classes/Aggregate/ContentElementIconAggregate.php
+++ b/Classes/Aggregate/ContentElementIconAggregate.php
@@ -34,11 +34,6 @@ protected function process()
             return;
         }
 
-        $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask_export']);
-        if (empty($extensionConfiguration['contentElementIcons'])) {
-            return;
-        }
-
         $maskConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask']);
         $maskIconFolder = PATH_site . $maskConfiguration['preview'];
 
diff --git a/Tests/Functional/Controller/AbstractExportControllerTestCase.php b/Tests/Functional/Controller/AbstractExportControllerTestCase.php
index 2ed0680..9037256 100644
--- a/Tests/Functional/Controller/AbstractExportControllerTestCase.php
+++ b/Tests/Functional/Controller/AbstractExportControllerTestCase.php
@@ -39,7 +39,6 @@ abstract class AbstractExportControllerTestCase extends FunctionalTestCase
         'EXT' => [
             'extConf' => [
                 'mask' => 'a:2:{s:4:"json";s:83:"typo3conf/ext/mask_export/Tests/Functional/Fixtures/Configuration/mask-default.json";s:7:"preview";s:70:"typo3conf/ext/mask_export/Tests/Functional/Fixtures/Templates/Preview/";}',
-                'mask_export' => 'a:1:{s:19:"contentElementIcons";s:1:"1";}',
             ],
         ],
     ];
diff --git a/ext_conf_template.txt b/ext_conf_template.txt
deleted file mode 100644
index 43e2050..0000000
--- a/ext_conf_template.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# cat=Experimental; type=boolean; label=LLL:EXT:mask_export/Resources/Private/Language/locallang.xlf:config.contentElementIcons
-contentElementIcons =