Fix query see #7474

1.10.x
Julio Montoya 11 years ago
parent 73b52dbc4b
commit ae5594d30b
  1. 8
      main/inc/lib/agenda.lib.php

@ -1341,14 +1341,16 @@ class Agenda
} }
$dateCondition = null; $dateCondition = null;
if (!empty($start) && !empty($end)) { if (!empty($start) && !empty($end)) {
$dateCondition .= "AND ( $dateCondition .= "AND (
(agenda.start_date >= '".$start."' OR agenda.start_date IS NULL) AND agenda.start_date BETWEEN '".$start."' AND '".$end."' OR
(agenda.end_date <= '".$end."' OR agenda.end_date IS NULL) agenda.end_date BETWEEN '".$start."' AND '".$end."'
)"; )";
} }
$sql .= $dateCondition; $sql .= $dateCondition;
//echo $sql;
$allowComments = api_get_configuration_value('allow_agenda_event_comment'); $allowComments = api_get_configuration_value('allow_agenda_event_comment');
$result = Database::query($sql); $result = Database::query($sql);
@ -1543,7 +1545,7 @@ class Agenda
*/ */
private function formatEventDate($utcTime) private function formatEventDate($utcTime)
{ {
return date('c', api_strtotime(api_get_local_time($utcTime))); return date(DateTime::ISO8601, api_strtotime(api_get_local_time($utcTime)));
} }
/** /**

Loading…
Cancel
Save