Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
fb907848
Commit
fb907848
authored
Jan 21, 2019
by
Carsten Rose
Browse files
Fixes #7702: Form/FE: Unnecessary evaluation of column 'noteInternal' / 'adminNote'
parent
c82de330
Pipeline
#1379
passed with stage
in 2 minutes and 22 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Source/core/Constants.php
View file @
fb907848
...
...
@@ -853,6 +853,7 @@ const F_REQUIRED_PARAMETER_EDIT = 'requiredParameterEdit';
const
F_EXTRA_DELETE_FORM
=
'extraDeleteForm'
;
const
F_FINAL_DELETE_FORM
=
'finalDeleteForm'
;
const
F_DIRTY_MODE
=
'dirtyMode'
;
const
F_NOTE_INTERNAL
=
'noteInternal'
;
const
F_SUBMIT_BUTTON_TEXT
=
'submitButtonText'
;
const
F_BUTTON_ON_CHANGE_CLASS
=
'buttonOnChangeClass'
;
...
...
@@ -994,6 +995,7 @@ const FE_SUBRECORD_OPTION = 'subrecordOption';
const
FE_SQL1
=
'sql1'
;
const
FE_PLACEHOLDER
=
'placeholder'
;
const
FE_DATA_REFERENCE
=
'dataReference'
;
const
FE_ADMIN_NOTE
=
'adminNote'
;
// FormElement columns: via parameter field
const
FE_DATE_FORMAT
=
'dateFormat'
;
// value: FORMAT_DATE_INTERNATIONAL | FORMAT_DATE_GERMAN
...
...
extension/Source/core/QuickFormQuery.php
View file @
fb907848
...
...
@@ -1159,6 +1159,8 @@ class QuickFormQuery {
break
;
}
unset
(
$form
[
F_NOTE_INTERNAL
]);
if
(
isset
(
$form
[
F_ESCAPE_TYPE_DEFAULT
])
&&
$form
[
F_ESCAPE_TYPE_DEFAULT
]
==
TOKEN_ESCAPE_CONFIG
)
{
$form
[
F_ESCAPE_TYPE_DEFAULT
]
=
$this
->
store
->
getVar
(
SYSTEM_ESCAPE_TYPE_DEFAULT
,
STORE_SYSTEM
);
}
...
...
extension/Source/core/helper/HelperFormElement.php
View file @
fb907848
...
...
@@ -51,7 +51,9 @@ class HelperFormElement {
public
static
function
formElementSetDefault
(
array
$elements
)
{
foreach
(
$elements
AS
$key
=>
$element
)
{
$elements
[
$key
][
FE_TG_INDEX
]
=
0
;
unset
(
$elements
[
$key
][
FE_ADMIN_NOTE
]);
// $elements[$key][FE_DATA_REFERENCE] = '';
}
return
$elements
;
...
...
Write
Preview
Markdown
is supported
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