From a7bcce3b19599b985fbbb3375bb7bf40af89dcea Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 11 Mar 2019 16:09:42 +0100
Subject: [PATCH] FEAT #9514 Merge fix
---
src/app/contentManagement/controllers/MergeController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 51e87fa957f..d61d1161cec 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -94,7 +94,7 @@ class MergeController
if (!empty($resource['nature_id'])) {
$resource['nature_id'] = ResModel::getNatureLabel(['nature_id' => $resource['nature_id']]);
}
- $doctype = DoctypeExtModel::getById(['typeId' => $resource['type_id'], 'select' => ['process_delay', 'process_mode']]);
+ $doctype = DoctypeExtModel::getById(['id' => $resource['type_id'], 'select' => ['process_delay', 'process_mode']]);
$resource['process_delay'] = $doctype['process_delay'];
$resource['process_mode'] = $doctype['process_mode'];
--
GitLab