diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 927baac1ae8..168b1381c4c 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -504,15 +504,15 @@ if ($conf->global->ENABLE_AGENDA_EXT==1 && $conf->global->AGENDA_EXT_NB>0)
{
// Create a new object action
$event=new ActionComm($db);
- $event->id=$icalevent->UID;
- $event->datep=$icalevent->DTSTART;
- $event->datef=$icalevent->DTEND;
+ $event->id=$icalevent[UID];
+ $event->datep=$icalevent[DTSTART];
+ $event->datef=$icalevent[DTEND];
$event->type_code="ICALEVENT";
- $event->libelle=$icalevent->SUMMARY;
+ $event->libelle=''.$icalevent[SUMMARY].'
'.dol_nl2br($icalevent[DESCRIPTION],1,false);
//$event->fulldayevent=$obj->fulldayevent;
$event->date_start_in_calendar=$event->datep;
- /*
+
if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
else $event->date_end_in_calendar=$event->datep;
@@ -531,7 +531,7 @@ if ($conf->global->ENABLE_AGENDA_EXT==1 && $conf->global->AGENDA_EXT_NB>0)
{
if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow;
- */
+
// Add an entry in actionarray for each day
$daycursor=$event->date_start_in_calendar;
$annee = date('Y',$daycursor);
@@ -548,7 +548,7 @@ if ($conf->global->ENABLE_AGENDA_EXT==1 && $conf->global->AGENDA_EXT_NB>0)
if ($daykey > $event->date_end_in_calendar) $loop=false;
}
while ($loop);
- //}
+ }
}
}
@@ -880,7 +880,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
if ($linerelatedto) print $linerelatedto.'
';
// Show label
- print $event->getNomUrl(0,$maxnbofchar,'cal_event');
+ if($event->type_code == 'ICALEVENT') print $event->libelle;
+ else print $event->getNomUrl(0,$maxnbofchar,'cal_event');
}
else // It's a birthday
{
@@ -898,7 +899,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '';
// Status - Percent
print '