From 088c842a01217b61cd6c25f680b1a47a70d3c053 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 18 Nov 2019 16:17:08 +0100
Subject: [PATCH] FIX #11282 TIME 0:10 merge custom fields json decoded
---
src/app/contentManagement/controllers/MergeController.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 8d775dbad94..76ddac652a7 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -270,7 +270,13 @@ class MergeController
'orderBy' => ['value']
]);
foreach ($customs as $custom) {
- $customField[$custom['custom_field_id']] = $custom['value'];
+ $decoded = json_decode($custom['value']);
+
+ if (is_array($decoded)) {
+ $customField[$custom['custom_field_id']] = implode("\n", $decoded);
+ } else {
+ $customField[$custom['custom_field_id']] = $decoded;
+ }
}
} else {
if (!empty($args['customFields'])) {
--
GitLab