Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
e2d9380f65
@ -46,7 +46,7 @@ class AlertRepository extends EntityRepository
|
||||
$niveau01=($user?$user->getNiveau01():null);
|
||||
$groups=($user?$user->getGroups():[]);
|
||||
|
||||
$userreads=($user?$user->getAlertreaders():[]);
|
||||
$userreads=($user?$user->getAlertreaders():new ArrayCollection());
|
||||
|
||||
// Initialisation du calcul des alerts
|
||||
$alerts=new ArrayCollection();
|
||||
|
Loading…
Reference in New Issue
Block a user