From 90ccc301ba35fc9c3d94f4e61e10cc23d323be24 Mon Sep 17 00:00:00 2001
From: noelma <noel-mathieu@hotmail.fr>
Date: Sun, 17 Jan 2021 12:23:13 +0100
Subject: [PATCH] =?UTF-8?q?Fixe,=20correction=20du=20retour=20des=20champs?=
 =?UTF-8?q?=20=C3=A0=20l'=C3=A9dition=20de=20l'utilisateur=20en=20cas=20d'?=
 =?UTF-8?q?erreurs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/modules/User/Controller/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/User/Controller/User.php b/core/modules/User/Controller/User.php
index 266d9d40..5649a944 100644
--- a/core/modules/User/Controller/User.php
+++ b/core/modules/User/Controller/User.php
@@ -227,7 +227,7 @@ public function edit($id, $req)
         $this->container->callHook('user.edit.form.data', [ &$values, $id ]);
 
         if (isset($_SESSION[ 'inputs' ])) {
-            $values = $_SESSION[ 'inputs' ];
+            $values = array_replace($values, $_SESSION[ 'inputs' ]);
             unset($_SESSION[ 'inputs' ]);
         }