From 00db749f0f05ca40576d6d6c2f223ff4eaf85e17 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 13 Jan 2020 15:46:08 +0100
Subject: [PATCH] FEAT #12091 TIME 0:15 fix merge custom fields
---
.../contentManagement/controllers/MergeController.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 1b2c4886282..141a0ba0b39 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -259,13 +259,11 @@ class MergeController
//CustomFields
if (!empty($args['resId'])) {
$customs = !empty($resource['custom_fields']) ? json_decode($resource['custom_fields'], true) : [];
- foreach ($customs as $custom) {
- $decoded = json_decode($custom['value']);
-
- if (is_array($decoded)) {
- $resource['customField_' . $custom['custom_field_id']] = implode("\n", $decoded);
+ foreach ($customs as $customId => $custom) {
+ if (is_array($custom)) {
+ $resource['customField_' . $customId] = implode("\n", $custom);
} else {
- $resource['customField_' . $custom['custom_field_id']] = $decoded;
+ $resource['customField_' . $customId] = $custom;
}
}
} else {
--
GitLab