Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
webform
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
webform
Merge requests
!473
Fix translation issue setting last option label translated with first element translated label
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix translation issue setting last option label translated with first element translated label
issue/webform-3451193:6.2.x
into
6.2.x
Overview
1
Commits
4
Pipelines
7
Changes
1
1 unresolved thread
Hide all comments
Merged
Ludovic Favre
requested to merge
issue/webform-3451193:6.2.x
into
6.2.x
1 year ago
Overview
1
Commits
4
Pipelines
7
Changes
1
1 unresolved thread
Hide all comments
Expand
0
0
Merge request reports
Compare
6.2.x
version 5
03a44e83
11 months ago
version 4
85e35363
11 months ago
version 3
7a7b4ab4
11 months ago
version 2
6ab592c6
11 months ago
version 1
cdb2f7b8
1 year ago
6.2.x (base)
and
latest version
latest version
16130b47
4 commits,
11 months ago
version 5
03a44e83
5 commits,
11 months ago
version 4
85e35363
4 commits,
11 months ago
version 3
7a7b4ab4
3 commits,
11 months ago
version 2
6ab592c6
2 commits,
11 months ago
version 1
cdb2f7b8
1 commit,
1 year ago
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/Utility/WebformElementHelper.php
+
2
−
2
Options
@@ -542,9 +542,9 @@ class WebformElementHelper {
* An array of options to be merged.
*/
public
static
function
mergeOptions
(
array
&
$options
,
array
$source_options
)
{
foreach
(
$options
as
$key
=>
&
$option
)
{
foreach
(
$options
as
$key
=>
$option
)
{
if
(
isset
(
$source_options
[
$key
])
&&
is_scalar
(
$option
)
&&
gettype
(
$option
)
===
gettype
(
$source_options
[
$key
]))
{
$option
=
$source_options
[
$key
];
$option
s
[
$key
]
=
$source_options
[
$key
];
}
elseif
(
is_array
(
$option
))
{
unset
(
$options
[
$key
]);
Loading