Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Julie Lenaerts 2022-02-15 10:01:01 +01:00
commit 385664e2bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
View File

@ -60,7 +60,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
{ {
if ($period->hasPreviousUser() if ($period->hasPreviousUser()
&& $period->getUser() !== $this->security->getUser() && $period->getUser() !== $this->security->getUser()
&& $period->getUser() !== null && null !== $period->getUser()
&& $period->getStep() !== AccompanyingPeriod::STEP_DRAFT && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
) { ) {
$this->generateNotificationToUser($period); $this->generateNotificationToUser($period);