From 68463d1e9466d57f019263cc3b22d5ea783a30d0 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 15 Oct 2020 10:42:23 +0200
Subject: [PATCH] FEAT #5241 TIME 0:35 reconcile qr code in json
---
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 d0d5a872797..46474e562fa 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -394,7 +394,13 @@ class MergeController
$prefix = 'MAARCH_';
}
- $data = $prefix . $args['chrono'] . ';' . $args['resIdMaster'] . ';' . $args['originId'] . ';' . $args['title'];
+ $data = [
+ 'chrono' => $prefix . $args['chrono'],
+ 'resIdMaster' => $args['resIdMaster'],
+ 'originId' => $args['originId'],
+ 'title' => $args['title']
+ ];
+ $data = json_encode($data);
$qrCode = new QrCode($data);
$qrCode->setSize(400);
$qrCode->setMargin(25);
--
GitLab