extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix broken filemanager after PM integration commit

Browse Source 
array_merge_recursive accumulates values in sub-arrays:
array_merge_recursive(['nm'=>['get_rows'=>'a.c.m']], ['nm'=>['get_rows'=>'a.c.m']]) === ['nm'=>['get_rows'=>['a.c.m','a.c.m']]
This commit is contained in:
Ralf Becker 2021-12-02 22:18:41 +02:00 committed by nathan
parent 60bc11a66e
commit 7d7557fe3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Etemplate.php
View File

@ -119,22 +119,22 @@ class Etemplate extends Etemplate\Widget\Template
{
if (!empty($extra['data']) && is_array($extra['data']))
{
$content = array_merge_recursive($content, $extra['data']);
$content = self::complete_array_merge($content, $extra['data']);
}
if (!empty($extra['preserve']) && is_array($extra['preserve']))
{
$preserv = array_merge_recursive($preserv, $extra['preserve']);
$preserv = self::complete_array_merge($preserv, $extra['preserve']);
}
if (!empty($extra['readonlys']) && is_array($extra['readonlys']))
{
$readonlys = array_merge_recursive($readonlys, $extra['readonlys']);
$readonlys = self::complete_array_merge($readonlys, $extra['readonlys']);
}
if (!empty($extra['sel_options']) && is_array($extra['sel_options']))
{
$sel_options = array_merge_recursive($sel_options, $extra['sel_options']);
$sel_options = self::complete_array_merge($sel_options, $extra['sel_options']);
}
}
}