diff --git a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
index 4ef239fef9bda63c09f724d468e03db0e291cf00..cb75f2f3ad9c894214d7ebc3bf806be9e929aa7f 100644
--- a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
+++ b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
@@ -100,14 +100,6 @@ class ConfigurationForm extends ExtendedTemplateService
return $this->ext_getCategoryLabelArray();
}
- /**
- * @param string $cat
- */
- public function ext_makeHelpInformationForCategory($cat)
- {
- $this->ext_getTSCE_config($cat);
- }
-
/**
* Get the form for extension configuration
*
@@ -121,7 +113,6 @@ class ConfigurationForm extends ExtendedTemplateService
*/
public function ext_getForm($cat, $theConstants, $script = '', $addFields = '', $extKey = '', $addFormTag = true)
{
- $this->ext_makeHelpInformationForCategory($cat);
$printFields = trim($this->ext_printFields($theConstants, $cat));
$content = '';
$content .= GeneralUtility::wrapJS('
@@ -135,26 +126,9 @@ class ConfigurationForm extends ExtendedTemplateService
$content .= $addFields;
$content .= $printFields;
$content .= '<input class="btn btn-default" type="submit" name="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_tsfe.xlf:update')) . '" id="configuration-submit-' . htmlspecialchars($extKey) . '" />';
- $example = $this->ext_displayExample();
- $content .= $example ? '<hr/>' . $example : '';
return $content;
}
- /**
- * Display example
- *
- * @return string
- */
- public function ext_displayExample()
- {
- $out = '';
- if ($this->helpConfig['description'] || $this->helpConfig['header']) {
- $out = ($this->helpConfig['description'] ? implode(explode('//', $this->helpConfig['description']), '<br />') . '<br />' : '')
- . ($this->helpConfig['bulletlist'] ? '<ul><li>' . implode(explode('//', $this->helpConfig['bulletlist']), '<li>') . '</ul>' : '<BR>');
- }
- return $out;
- }
-
/**
* Merge incoming with existing
*
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 97e1f64b02dba3039e6e1ab3a83e85e52f34c637..ee920bf957164bfd2394948dfe97abb08d38460f 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -219,11 +219,6 @@ class ExtendedTemplateService extends TemplateService
*/
public $linkObjects = false;
- /**
- * @var array
- */
- public $helpConfig = [];
-
/**
* @var bool
*/
@@ -1081,37 +1076,6 @@ class ExtendedTemplateService extends TemplateService
return $retArr;
}
- /**
- * @param string $category
- */
- public function ext_getTSCE_config($category)
- {
- $catConf = $this->setup['constants']['TSConstantEditor.'][$category . '.'];
- $out = [];
- if (is_array($catConf)) {
- foreach ($catConf as $key => $val) {
- switch ($key) {
- case 'description':
- case 'bulletlist':
- case 'header':
- $out[$key] = $val;
- break;
- default:
- if (MathUtility::canBeInterpretedAsInteger($key)) {
- $constRefs = explode(',', $val);
- foreach ($constRefs as $const) {
- $const = trim($const);
- if ($const) {
- $out['constants'][$const] .= '<span class="label label-danger">' . $key . '</span>';
- }
- }
- }
- }
- }
- }
- $this->helpConfig = $out;
- }
-
/**
* @param array $params
* @return array
@@ -1142,7 +1106,6 @@ class ExtendedTemplateService extends TemplateService
$output = '';
$subcat = '';
if (is_array($this->categories[$category])) {
- $help = $this->helpConfig;
if (!$this->doNotSortCategoriesBeforeMakingForm) {
asort($this->categories[$category]);
}
@@ -1351,7 +1314,7 @@ class ExtendedTemplateService extends TemplateService
$output .=
'<fieldset class="form-section">'
- . '<a name="' . $raname . '"></a>' . $help['constants'][$params['name']]
+ . '<a name="' . $raname . '"></a>'
. '<div class="form-group">'
. $constantLabel . $constantName . $constantDescription . $constantData
. '</div>'
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index f2a7930b0e45734369fd0a27e8c7d31be8db61dc..c1943df5c53985920c46691390ff8760d4a94f09 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -1266,13 +1266,10 @@ class TemplateService
{
if (is_array($setupArray)) {
foreach ($setupArray as $key => $val) {
- if ($prefix || strpos($key, 'TSConstantEditor') !== 0) {
- // We don't want 'TSConstantEditor' in the flattened setup on the first level (190201)
- if (is_array($val)) {
- $this->flattenSetup($val, $prefix . $key);
- } else {
- $this->flatSetup[$prefix . $key] = $val;
- }
+ if (is_array($val)) {
+ $this->flattenSetup($val, $prefix . $key);
+ } else {
+ $this->flatSetup[$prefix . $key] = $val;
}
}
}
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c192f9ead0bbbffa325ccacd76f0ad1e6962e334
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst
@@ -0,0 +1,41 @@
+.. include:: ../../Includes.txt
+
+=============================================================
+Breaking: #82398 - Remove special constant "TSConstantEditor"
+=============================================================
+
+See :issue:`82398`
+
+Description
+===========
+
+The special functionality on the top level constant name `TSConstantEditor`
+has been dropped. This rarely used feature makes this constant name a casual
+constant without further added features.
+
+A series of PHP class methods and properties has been dropped together with that removal:
+
+* Method :php:`TYPO3\CMS\Core\TypoScript\ConfigurationForm->ext_makeHelpInformationForCategory()`
+* Method :php:`TYPO3\CMS\Core\TypoScript\ConfigurationForm->ext_displayExample()`
+* Method :php:`TYPO3\CMS\Core\TypoScript\ExtendedTemplateService->ext_getTSCE_config()`
+* Property :php:`TYPO3\CMS\Core\TypoScript\ExtendedTemplateService->helpConfig`
+* Method :php:`TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory->setHighlightText()`
+* Method :php:`TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory->getHighlightText()`
+* Method :php:`TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem->setHighlight()`
+* Method :php:`TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem->getHighlight()`
+
+Impact
+======
+
+The constants editor does not show any extending information (like bulletpoints) for a constant
+anymore configured via the `TSConstantEditor` object.
+
+
+Affected Installations
+======================
+
+All installations which have configured the special constant "TSConstantEditor". Since this has
+been a widely unknown feature, most instances should not be affected. On PHP side, the extension
+scanner will find consuming extensions of the dropped API, but that is highly unlikely, too.
+
+.. index:: Backend, TypoScript, FullyScanned
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
index ca20533b9f4a90f7c1afc3bd5278717a753ce40c..97457e65b1159832c5e2c9b9a466fe206711e677 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
@@ -29,11 +29,6 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
*/
protected $subcategories;
- /**
- * @var string
- */
- protected $highlightText = '';
-
/**
* Constructs this Category
*/
@@ -83,20 +78,4 @@ class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
{
return $this->name;
}
-
- /**
- * @param string $highlightText
- */
- public function setHighlightText($highlightText)
- {
- $this->highlightText = $highlightText;
- }
-
- /**
- * @return string
- */
- public function getHighlightText()
- {
- return $this->highlightText;
- }
}
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
index 5c168f9711215f79d07a9387d8012885617ef705..7af7ed0257e1c60e06a3412594a3bfab2793d8f6 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
@@ -59,11 +59,6 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
*/
protected $value = '';
- /**
- * @var int
- */
- protected $highlight = 0;
-
/**
* @param string $category
*/
@@ -191,20 +186,4 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
{
return $this->value;
}
-
- /**
- * @param int $highlight
- */
- public function setHighlight($highlight)
- {
- $this->highlight = $highlight;
- }
-
- /**
- * @return int
- */
- public function getHighlight()
- {
- return $this->highlight;
- }
}
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
index 0c357335c09844f483be7288d0a09bdafa0337ca..c983d84b005136020c648068f4c82c3a6433c502 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
@@ -61,7 +61,6 @@ class ConfigurationItemRepository
$resultArray = [];
if (!empty($configuration)) {
- $metaInformation = $this->addMetaInformation($configuration);
$hierarchicConfiguration = [];
foreach ($configuration as $configurationOption) {
$originalConfiguration = $this->buildConfigurationArray($configurationOption, $extensionKey);
@@ -82,8 +81,6 @@ class ConfigurationItemRepository
unset($subcatConfigurationArray);
}
unset($tempConfiguration);
-
- ArrayUtility::mergeRecursiveWithOverrule($hierarchicConfiguration, $metaInformation);
$resultArray = $hierarchicConfiguration;
}
@@ -152,20 +149,6 @@ class ConfigurationItemRepository
return $configurationOption;
}
- /**
- * Gets meta information from configuration array and
- * returns only the meta information
- *
- * @param array $configuration
- * @return array
- */
- protected function addMetaInformation(&$configuration)
- {
- $metaInformation = $configuration['__meta__'] ?: [];
- unset($configuration['__meta__']);
- return $metaInformation;
- }
-
/**
* Converts a hierarchic configuration array to an
* hierarchic object storage structure
@@ -180,10 +163,6 @@ class ConfigurationItemRepository
/** @var $configurationCategoryObject \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory */
$configurationCategoryObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory::class);
$configurationCategoryObject->setName($category);
- if ($subcategory['highlightText']) {
- $configurationCategoryObject->setHighlightText($subcategory['highlightText']);
- unset($subcategory['highlightText']);
- }
foreach ($subcategory as $subcatName => $configurationItems) {
/** @var $configurationSubcategoryObject \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory */
$configurationSubcategoryObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory::class);
@@ -223,9 +202,6 @@ class ConfigurationItemRepository
if (isset($configurationItem['value'])) {
$configurationObject->setValue($configurationItem['value']);
}
- if (isset($configurationItem['highlight'])) {
- $configurationObject->setHighlight($configurationItem['highlight']);
- }
$configurationSubcategoryObject->addItem($configurationObject);
}
$configurationCategoryObject->addSubcategory($configurationSubcategoryObject);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
index 1f3600c66886acbf4055eb6291f9102b1ce7ead5..63beddafb669de5b0d57b2f61d816e4fa039b4a8 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
@@ -98,9 +98,6 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface
* Create a flat array of configuration options from
* ext_conf_template.txt of an extension using core's typoscript parser.
*
- * Generates an array from the typoscript style constants and
- * adds meta data like TSConstantEditor comments
- *
* Result is an array, with configuration item as array keys,
* and item properties as key-value sub-array:
*
@@ -145,18 +142,6 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface
$theConstants[$configurationOptionName]['subcat_label'] = $tsStyleConfig->subCategories[$configurationOption['subcat_name']][0];
}
}
-
- // Set up the additional descriptions
- if (isset($tsStyleConfig->setup['constants']['TSConstantEditor.'])) {
- foreach ($tsStyleConfig->setup['constants']['TSConstantEditor.'] as $category => $highlights) {
- $theConstants['__meta__'][rtrim($category, '.')]['highlightText'] = $highlights['description'];
- foreach ($highlights as $highlightNumber => $value) {
- if (rtrim($category, '.') == $theConstants[$value]['cat']) {
- $theConstants[$value]['highlight'] = $highlightNumber;
- }
- }
- }
- }
}
return $theConstants;
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
index 9f605013c301112a5b596858bef4260b25fa4e40..cfcfe6f5b8846ac57112f21356c49c7ad047503c 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html
@@ -56,9 +56,6 @@
</f:if>
</span>
</label>
- <f:if condition="{item.highlight}">
- <p class="text-danger">{item.highlight}</p>
- </f:if>
<div class="form-control-wrap">
<em:form.typoScriptConstants configuration="{item}" />
</div>
@@ -69,9 +66,6 @@
</f:for>
</div>
</f:for>
- <f:if condition="{category.highlightText}">
- {category.highlightText->f:format.raw()}
- </f:if>
</div>
</f:if>
</f:for>
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
index f373847035e8cb985a87c0ece0780fb4bea16653..e22dada937caa9fc6b02f154ba80b7ac3d853771 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -171,32 +171,6 @@ class ConfigurationItemRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\
);
}
- /**
- * @test
- */
- public function addMetaInformationUnsetsOriginalConfigurationMetaKey()
- {
- $configuration = [
- '__meta__' => 'metaInformation',
- 'test123' => 'test123'
- ];
- $this->configurationItemRepository->_callRef('addMetaInformation', $configuration);
- $this->assertEquals(['test123' => 'test123'], $configuration);
- }
-
- /**
- * @test
- */
- public function addMetaInformationReturnsMetaInformation()
- {
- $configuration = [
- '__meta__' => 'metaInformation',
- 'test123' => 'test123'
- ];
- $meta = $this->configurationItemRepository->_callRef('addMetaInformation', $configuration);
- $this->assertEquals('metaInformation', $meta);
- }
-
/**
* @return array
*/
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
index 54c5f40d8fde454b53af4bd168cee4f8a0933582..e9949c7bede4154ad43950ac54e1ff8b86a63437 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -161,14 +161,6 @@ class ConfigurationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
->method('ext_initTSstyleConfig')
->will($this->returnValue($constants));
- $setupTsConstantEditor = [
- 'advancedbackend.' => [
- 'description' => '<span style="background:red; padding:1px 2px; color:#fff; font-weight:bold;">1</span> Install tool has hardcoded md5 hashing, enabling this setting will prevent use of a install-tool-created BE user.<br />Currently same is for changin password with user setup module unless you use pending patch!',
- 1 => 'BE.forceSalted'
- ]
- ];
- $tsStyleConfig->setup['constants']['TSConstantEditor.'] = $setupTsConstantEditor;
-
$expected = [
'checkConfigurationFE' => [
'cat' => 'basic',
@@ -189,13 +181,7 @@ class ConfigurationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
'name' => 'BE.forceSalted',
'value' => '0',
'default_value' => '0',
- 'highlight' => 1,
],
- '__meta__' => [
- 'advancedbackend' => [
- 'highlightText' => '<span style="background:red; padding:1px 2px; color:#fff; font-weight:bold;">1</span> Install tool has hardcoded md5 hashing, enabling this setting will prevent use of a install-tool-created BE user.<br />Currently same is for changin password with user setup module unless you use pending patch!'
- ]
- ]
];
$result = $configurationUtility->getDefaultConfigurationFromExtConfTemplateAsValuedArray($this->getUniqueId('some_extension'));
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
index 715c2906a26e9ea2e09f129b8c9e44e8b06db875..25852d9f955efa043c6703db08aa7a6d6f8a368f 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
@@ -1177,4 +1177,53 @@ return [
'Breaking-55298-DecoupledHistoryFunctionality.rst',
],
],
+ 'TYPO3\CMS\Core\TypoScript\ConfigurationForm->ext_makeHelpInformationForCategory' => [
+ 'numberOfMandatoryArguments' => 1,
+ 'maximumNumberOfArguments' => 1,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Core\TypoScript\ConfigurationForm->ext_displayExample' => [
+ 'numberOfMandatoryArguments' => 0,
+ 'maximumNumberOfArguments' => 0,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Core\TypoScript\ExtendedTemplateService->ext_getTSCE_config' => [
+ 'numberOfMandatoryArguments' => 1,
+ 'maximumNumberOfArguments' => 1,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory->setHighlightText' => [
+ 'numberOfMandatoryArguments' => 1,
+ 'maximumNumberOfArguments' => 1,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory->getHighlightText' => [
+ 'numberOfMandatoryArguments' => 0,
+ 'maximumNumberOfArguments' => 0,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem->setHighlight' => [
+ 'numberOfMandatoryArguments' => 1,
+ 'maximumNumberOfArguments' => 1,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
+ 'TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem->getHighlight' => [
+ 'numberOfMandatoryArguments' => 0,
+ 'maximumNumberOfArguments' => 0,
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
];
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php
index 4c2432ef5526c7770047cb1d7d58086325b6c978..15010cd287327150130f98baa2fb524f29f56c8f 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php
@@ -179,6 +179,11 @@ return [
'Breaking-55298-DecoupledHistoryFunctionality.rst',
],
],
+ 'TYPO3\CMS\Core\TypoScript\ExtendedTemplateService->helpConfig' => [
+ 'restFiles' => [
+ 'Breaking-82398-RemoveSpecialConstantTSConstantEditor.rst',
+ ],
+ ],
// Deprecated public properties
];
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
index a1edcfe5795658d3c129dea3cc5f847c18196e9c..4de03c7e5b8c90ac3b4d1ea86191fe82148b01ca 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
@@ -83,22 +83,6 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends AbstractF
return false;
}
- /**
- * Get the data for display of an example
- *
- * @return array
- */
- public function getHelpConfig()
- {
- $result = [];
- if ($this->templateService->helpConfig['description'] || $this->templateService->helpConfig['header']) {
- $result['header'] = $this->templateService->helpConfig['header'];
- $result['description'] = explode('//', $this->templateService->helpConfig['description']);
- $result['bulletList'] = explode('//', $this->templateService->helpConfig['bulletlist']);
- }
- return $result;
- }
-
/**
* Main
*
@@ -157,7 +141,6 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends AbstractF
}
// Category and constant editor config:
$category = $this->pObj->MOD_SETTINGS['constant_editor_cat'];
- $this->templateService->ext_getTSCE_config($category);
$printFields = trim($this->templateService->ext_printFields($this->constants, $category));
foreach ($this->templateService->getInlineJavaScript() as $name => $inlineJavaScript) {
@@ -167,10 +150,6 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends AbstractF
if ($printFields) {
$assigns['printFields'] = $printFields;
}
- $BE_USER_modOptions = BackendUtility::getModTSconfig(0, 'mod.' . $this->pObj->MCONF['name']);
- if ($BE_USER_modOptions['properties']['constantEditor.']['example'] !== 'top') {
- $assigns['helpConfig'] = $this->getHelpConfig();
- }
// Rendering of the output via fluid
$view = GeneralUtility::makeInstance(StandaloneView::class);
$view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName(
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditor.html b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditor.html
index 78640f4b84c01c3f2c0498bee508f417ac227e19..db4d7f058863956cae96b351d60e38aaff0ba653 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditor.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditor.html
@@ -33,22 +33,4 @@
</f:format.raw>
</div>
</f:if>
- <f:if condition="{helpConfig.header}">
- <div style="padding-top: 30px;"></div>
- <div>
- {helpConfig.header}<br>
- <f:if condition="{helpConfig.description}">
- <f:for each="{helpConfig.description}" as="line">
- {line}<br>
- </f:for>
- </f:if>
- <f:if condition="{helpConfig.bulletList}">
- <ul>
- <f:for each="{helpConfig.bulletList}" as="line">
- <li>{line}</li>
- </f:for>
- </ul>
- </f:if>
- </div>
- </f:if>
</div>