Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
TYPO3
sg_mail
Commits
db126e34
Commit
db126e34
authored
Mar 26, 2019
by
Torsten Oppermann
Browse files
[TASK] Prevent empty marker label
parent
7fe12b6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Classes/Service/MailTemplateService.php
View file @
db126e34
...
...
@@ -846,9 +846,10 @@ class MailTemplateService {
$allMarker
=
''
;
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
];
}
if
(
\
is_string
(
$value
))
{
$allMarker
.
=
$key
.
': '
.
$value
.
PHP_EOL
;
}
elseif
(
\
is_array
(
$value
))
{
...
...
Classes/XClass/Form/FormEditorController.php
View file @
db126e34
...
...
@@ -150,11 +150,7 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll
$markerName
=
$markerArray
[
0
];
}
$markerName
=
RegisterService
::
normalizeFormFieldMarkerName
(
$markerName
);
$markerLabel
=
$markerArray
[
0
];
if
(
isset
(
$markerArray
[
1
]))
{
$markerLabel
=
$markerArray
[
1
];
}
$markerLabel
=
$markerArray
[
1
]
??
$markerArray
[
0
];
$markers
[
$markerName
]
=
[
'identifier'
=>
$markerName
,
'type'
=>
MailTemplateService
::
MARKER_TYPE_STRING
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment