blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

use array_replace_recursive instead of array_merge_recursive to prevent two scalar values being merged to an array

Browse Source
This commit is contained in:
Harald Bamberger
2026-03-25 15:15:05 +01:00
parent 1951cd6fa8
commit 5139c3e44e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/dashboard/User.php
+2 -2
View File
@@ -59,8 +59,8 @@ class User extends FHCAPI_Controller
$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_merge_recursive', $defaultconfig) : [];
$userconfig_squashed = $userconfig ? call_user_func_array('array_merge_recursive', $userconfig) : [];
$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);