Skip to content
Snippets Groups Projects
Commit db126e34 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Prevent empty marker label

parent 7fe12b6f
No related branches found
Tags 5.2.7
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Classes/Service/MailTemplateService.php
+ 2
− 1
View file @ db126e34
...@@ -846,9 +846,10 @@ class MailTemplateService { ...@@ -846,9 +846,10 @@ class MailTemplateService {
$allMarker = ''; $allMarker = '';
foreach ($markers as $key => $value) { foreach ($markers as $key => $value) {
if (\array_key_exists($key, $this->markerLabels)) { if (\array_key_exists($key, $this->markerLabels) && $this->markerLabels[$key] !== NULL) {
$key = $this->markerLabels[$key]; $key = $this->markerLabels[$key];
} }
if (\is_string($value)) { if (\is_string($value)) {
$allMarker .= $key . ': ' . $value . PHP_EOL; $allMarker .= $key . ': ' . $value . PHP_EOL;
} elseif (\is_array($value)) { } elseif (\is_array($value)) {
......
Classes/XClass/Form/FormEditorController.php
+ 1
− 5
View file @ db126e34
...@@ -150,11 +150,7 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll ...@@ -150,11 +150,7 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll
$markerName = $markerArray[0]; $markerName = $markerArray[0];
} }
$markerName = RegisterService::normalizeFormFieldMarkerName($markerName); $markerName = RegisterService::normalizeFormFieldMarkerName($markerName);
$markerLabel = $markerArray[1] ?? $markerArray[0];
$markerLabel = $markerArray[0];
if (isset($markerArray[1])) {
$markerLabel = $markerArray[1];
}
$markers[$markerName] = [ $markers[$markerName] = [
'identifier' => $markerName, 'identifier' => $markerName,
'type' => MailTemplateService::MARKER_TYPE_STRING, 'type' => MailTemplateService::MARKER_TYPE_STRING,
......
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