[FOLLOWUP][FEATURE] IRRE useCombination option to modify warning text 14/42314/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 6 Aug 2015 12:48:22 +0000 (14:48 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Thu, 6 Aug 2015 12:52:16 +0000 (14:52 +0200)
Fix a fatal and a typo.

Resolves: #64535
Releases: master
Change-Id: I4a04c6482675dbd07771a8e3e2f5659f9360cebe
Reviewed-on: http://review.typo3.org/42314
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
typo3/sysext/core/Documentation/Changelog/master/Feature-64535-IrreSuppressAndOverrideUseCombinationWarningViaTcaSettings.rst

index 98a3d75..6b1feb2 100644 (file)
@@ -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';
                                if (!empty($config['appearance']['overwriteCombinationWarningMessage'])) {
                                        $combinationWarningMessage = $config['appearance']['overwriteCombinationWarningMessage'];
                                $combinationWarningMessage = 'LLL:EXT:lang/locallang_core.xlf:warning.inline_use_combination';
                                if (!empty($config['appearance']['overwriteCombinationWarningMessage'])) {
                                        $combinationWarningMessage = $config['appearance']['overwriteCombinationWarningMessage'];
index b48cfe1..aed56de 100644 (file)
@@ -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
 to suppress the FlashMessage completely via TCA setting.
 
 It is now possible to override the default warning message with a custom message or
 to suppress the FlashMessage completely via TCA setting.