From 2f959064101c3059b85cd3afb3d4d3d760454c0a Mon Sep 17 00:00:00 2001 From: soufiane Date: Tue, 12 Mar 2024 15:42:25 +0100 Subject: [PATCH] wait #6748 correctif setting json --- .../Admin/Operations/Tools/ImportFluidbookSettings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php index 291d92b24..41056448f 100644 --- a/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php +++ b/app/Http/Controllers/Admin/Operations/Tools/ImportFluidbookSettings.php @@ -51,8 +51,12 @@ trait ImportFluidbookSettings return $n; },json_decode($f->settings, true)); - $intersect = array_intersect_key($settings,$res[$id]); - $settingsJson = json_encode($intersect); + + $sett = array_filter($res[$id], function($v, $k) use($settings){ + return array_key_exists($k,$settings); + }, ARRAY_FILTER_USE_BOTH); + $settingsJson = json_encode($sett); + $diff = array_diff_key($res[$id], $settings); $diff['settings'] = $settingsJson; -- 2.39.5