Verified Commit eaf7fbd2 authored by Damien's avatar Damien

FEAT #11691 TIME 0:05 Merge error

parent 1702dc94
......@@ -246,7 +246,9 @@ class JnlpController
$dataToMerge = ['userId' => $GLOBALS['id']];
if (!empty($queryParams['objectTable'])) {
$decodedData = json_decode(urldecode($queryParams['objectTable']), true);
$dataToMerge = array_merge($dataToMerge, $decodedData);
if (!empty($decodedData)) {
$dataToMerge = array_merge($dataToMerge, $decodedData);
}
}
$mergedDocument = MergeController::mergeDocument([
'content' => file_get_contents($pathToCopy),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment