From 76f3666c638f4db770a83ec08a23aa4fe537cb72 Mon Sep 17 00:00:00 2001
From: Fan2Shrek <pierre27.ambroise@gmail.com>
Date: Tue, 19 Mar 2024 18:32:21 +0100
Subject: [PATCH] Rebase main

---
 src/Controller/ProfileController.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php
index 24fcdb71d..c46411ddd 100644
--- a/src/Controller/ProfileController.php
+++ b/src/Controller/ProfileController.php
@@ -120,7 +120,6 @@ public function editAction(Request $request, UserNotifier $userNotifier): Respon
             throw $this->createAccessDeniedException('This user does not have access to this section.');
         }
 
-        $oldEmail = $user->getEmail();
         $form = $this->createForm(ProfileFormType::class, $user);
 
         $form->handleRequest($request);
@@ -132,13 +131,15 @@ public function editAction(Request $request, UserNotifier $userNotifier): Respon
 
             $diffs = array_intersect(array_keys($changeSet), ['email', 'username']);
 
-            if (!empty($diffs) && $user instanceof User) {
+            if (!empty($diffs)) {
                 $reason = sprintf('Your %s has been changed', implode(' and ', $diffs));
-                $userNotifier->notifyChange($changeSet['email'][0] ?? $user->getEmail(), $reason);
-            }
 
-            if ($oldEmail !== $user->getEmail()) {
-                $user->resetPasswordRequest();
+                if (isset($changeSet['email'][0])) {
+                    $userNotifier->notifyChange($changeSet['email'][0], $reason);
+                    $user->resetPasswordRequest();
+                }
+
+                $userNotifier->notifyChange($user->getEmail(), $reason);
             }
 
             $this->getEM()->persist($user);