From 3bbff0aecf2a2f9ce452d3abb6b15e00b72f3392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Mon, 13 Mar 2023 22:43:26 +0100
Subject: [PATCH] Fixed errors that prevented import of users

---
 src/Controller/AdminPages/BaseAdminController.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index 2619f9f5..9e45e0dc 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -350,8 +350,8 @@ abstract class BaseAdminController extends AbstractController
             }
 
             $options = [
-                'parent' => $data['parent'],
-                'preserve_children' => $data['preserve_children'],
+                'parent' => $data['parent'] ?? null,
+                'preserve_children' => $data['preserve_children'] ?? false,
                 'format' => $format,
                 'class' => $this->entity_class,
                 'csv_delimiter' => $data['csv_delimiter'],
@@ -361,15 +361,14 @@ abstract class BaseAdminController extends AbstractController
 
             try {
                 $errors = $importer->importFileAndPersistToDB($file, $options);
+
+                foreach ($errors as $name => $error) {
+                    /** @var ConstraintViolationList $error */
+                    $this->addFlash('error', $name.': '.$error['violations']);
+                }
             }
             catch (UnexpectedValueException $e) {
                 $this->addFlash('error', 'parts.import.flash.error.invalid_file');
-                goto ret;
-            }
-
-            foreach ($errors as $name => $error) {
-                /** @var ConstraintViolationList $error */
-                $this->addFlash('error', $name.': '.$error['violations']);
             }
         }