From 721e2e3e6c33eb453cda527e08b9a30a04c67089 Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Wed, 7 Oct 2020 12:56:00 +0200
Subject: [PATCH] make better exception
---
extension/Classes/Core/Form/FormAsFile.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/extension/Classes/Core/Form/FormAsFile.php b/extension/Classes/Core/Form/FormAsFile.php
index 2e31b9726..38e2f9a8c 100644
--- a/extension/Classes/Core/Form/FormAsFile.php
+++ b/extension/Classes/Core/Form/FormAsFile.php
@@ -622,6 +622,7 @@ class FormAsFile
// Remove columns: id, name, fileStats
$formId = $form[F_ID];
+ $formName = $form[F_NAME];
unset($form[F_ID]);
unset($form[F_NAME]);
unset($form[F_FILE_STATS]);
@@ -631,12 +632,12 @@ class FormAsFile
$formElements = $database->sql($sql, ROW_REGULAR, $parameterArray); // array(array(column name => value))
// Translate container references (id to name) and remove all id columns
- $containerNames = array_reduce($formElements, function ($result, $formElement) {
+ $containerNames = array_reduce($formElements, function ($result, $formElement) use ($formName) {
if ($formElement[FE_CLASS] === FE_CLASS_CONTAINER) {
$containerName = $formElement[FE_NAME];
if (in_array($containerName, $result) || $containerName === '') {
throw new \UserFormException(json_encode([
- ERROR_MESSAGE_TO_USER => 'Duplicate container names.',
+ ERROR_MESSAGE_TO_USER => "Duplicate container names in form $formName",
ERROR_MESSAGE_TO_DEVELOPER => "Container Form Elements must have a unique and nonempty name. Container name: '$containerName'."]),
ERROR_FORM_INVALID_NAME);
}
--
GitLab