Commit c346e9bd authored by Christian Kuhn's avatar Christian Kuhn Committed by Andreas Fernandez
Browse files

[FOLLOWUP][FEATURE] IRRE useCombination option to modify warning text

Fix a fatal and a typo.

Resolves: #64535
Releases: master
Change-Id: I4a04c6482675dbd07771a8e3e2f5659f9360cebe
Reviewed-on: http://review.typo3.org/42314


Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: default avatarDaniel Goerz <ervaude@gmail.com>
Tested-by: default avatarDaniel Goerz <ervaude@gmail.com>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
parent 26a94bea
...@@ -255,7 +255,7 @@ class InlineRecordContainer extends AbstractContainer { ...@@ -255,7 +255,7 @@ class InlineRecordContainer extends AbstractContainer {
} }
// Display Warning FlashMessage if it is not suppressed // Display Warning FlashMessage if it is not suppressed
if (!isset($config['appearance']['suppressCombinationWarning']) || empty($config['appearance']['suppressCombinationWarning'])) if (!isset($config['appearance']['suppressCombinationWarning']) || empty($config['appearance']['suppressCombinationWarning'])) {
$combinationWarningMessage = 'LLL:EXT:lang/locallang_core.xlf:warning.inline_use_combination'; $combinationWarningMessage = 'LLL:EXT:lang/locallang_core.xlf:warning.inline_use_combination';
if (!empty($config['appearance']['overwriteCombinationWarningMessage'])) { if (!empty($config['appearance']['overwriteCombinationWarningMessage'])) {
$combinationWarningMessage = $config['appearance']['overwriteCombinationWarningMessage']; $combinationWarningMessage = $config['appearance']['overwriteCombinationWarningMessage'];
......
...@@ -5,7 +5,7 @@ Feature: #64535 - IRRE: Suppress and override useCombination warning via TCA set ...@@ -5,7 +5,7 @@ Feature: #64535 - IRRE: Suppress and override useCombination warning via TCA set
Description Description
=========== ===========
When using ``useCombation=TRUE`` there is always a FlashMessage warning displayed. When using ``useCombination=TRUE`` there is always a FlashMessage warning displayed.
It is now possible to override the default warning message with a custom message or It is now possible to override the default warning message with a custom message or
to suppress the FlashMessage completely via TCA setting. to suppress the FlashMessage completely via TCA setting.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment