Skip to content

Commit 938abef

Browse files
committed
Replace array_merge with array_replace
1 parent 5b0cf57 commit 938abef

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/Resources/contao/languages/de/tl_form.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22

3-
$GLOBALS['TL_LANG']['tl_form'] = array_merge(
4-
$GLOBALS['TL_LANG']['tl_form'],
5-
[
3+
$GLOBALS['TL_LANG']['tl_form'] = array_replace($GLOBALS['TL_LANG']['tl_form'] ?? [], [
64
'form_content_legend' => 'Form Content Bundle',
75
'fc_show_content' => ['Zeige Content Elemente nach dem Absenden an', 'Wenn aktiviert, werden nach dem Absenden des Formular die hinterlegten Content Element statt des Formulars angezeigt.'],
86
'fc_mode' => ['Modus', 'Wählen Sie einen Modus aus.'],

src/Resources/contao/languages/en/tl_form.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22

3-
$GLOBALS['TL_LANG']['tl_form'] = array_merge(
4-
$GLOBALS['TL_LANG']['tl_form'],
5-
[
3+
$GLOBALS['TL_LANG']['tl_form'] = array_replace($GLOBALS['TL_LANG']['tl_form'] ?? [], [
64
'form_content_legend' => 'Form Content Bundle',
75
'fc_show_content' => ['Show content elements after submitting', 'If activated, after submitting the form the stored content elements are displayed instead of the form itself.'],
86
'fc_mode' => ['Mode', 'Select a mode.'],

0 commit comments

Comments
 (0)