Calendar: Fixing entity error when not activating Collaborative event invitation -refs BT19475 BT19390

pull/4099/head
NicoDucou 4 years ago
parent eec125879d
commit 4fd8843524
  1. 5
      main/inc/lib/agenda.lib.php

@ -1612,8 +1612,10 @@ class Agenda
$endCondition = '';
$em = Database::getManager();
$agendaCollectiveInvitations = api_get_configuration_value('agenda_collective_invitations');
if ($agendaCollectiveInvitations) {
$inviteeRepo = $em->getRepository('ChamiloCoreBundle:AgendaEventInvitee');
}
if ($start !== 0) {
$startDate = api_get_utc_datetime($start, true, true);
$startCondition = "AND date >= '".$startDate->format('Y-m-d H:i:s')."'";
@ -1623,7 +1625,6 @@ class Agenda
$endCondition = "AND (enddate <= '".$endDate->format('Y-m-d H:i:s')."' OR enddate IS NULL)";
}
$user_id = api_get_user_id();
$agendaCollectiveInvitations = api_get_configuration_value('agenda_collective_invitations');
$sql = "SELECT * FROM ".$this->tbl_personal_agenda."
WHERE user = $user_id $startCondition $endCondition";

Loading…
Cancel
Save