Better fix: enforce types in wrapper class
This commit is contained in:
parent
dfc86d6ffb
commit
6ea6dd386b
2 changed files with 4 additions and 4 deletions
|
@ -603,8 +603,8 @@ class calendar extends rcube_plugin
|
||||||
$json[] = array(
|
$json[] = array(
|
||||||
'start' => date('c', $event['start']), // ISO 8601 date (added in PHP 5)
|
'start' => date('c', $event['start']), // ISO 8601 date (added in PHP 5)
|
||||||
'end' => date('c', $event['end']), // ISO 8601 date (added in PHP 5)
|
'end' => date('c', $event['end']), // ISO 8601 date (added in PHP 5)
|
||||||
'description' => $event['description'],
|
'description' => strval($event['description']),
|
||||||
'location' => $event['location'],
|
'location' => strval($event['location']),
|
||||||
'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true),
|
'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . 'cat-' . asciiwords($event['categories'], true),
|
||||||
'allDay' => ($event['all_day'] == 1)?true:false,
|
'allDay' => ($event['all_day'] == 1)?true:false,
|
||||||
) + $event;
|
) + $event;
|
||||||
|
|
|
@ -322,8 +322,8 @@ class kolab_calendar
|
||||||
return array(
|
return array(
|
||||||
'id' => $rec['uid'],
|
'id' => $rec['uid'],
|
||||||
'uid' => $rec['uid'],
|
'uid' => $rec['uid'],
|
||||||
'title' => strval($rec['summary']),
|
'title' => $rec['summary'],
|
||||||
'location' => strval($rec['location']),
|
'location' => $rec['location'],
|
||||||
'description' => $rec['body'],
|
'description' => $rec['body'],
|
||||||
'start' => $rec['start-date'],
|
'start' => $rec['start-date'],
|
||||||
'end' => $rec['end-date'],
|
'end' => $rec['end-date'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue