diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-13 21:38:33 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-13 21:38:33 +0200 |
| commit | c24752dc1d114b22ff38792c04561c456ea8701d (patch) | |
| tree | 5a0324a20f1c73566eda26ebc3a726891c59147b /apps/calendar/lib | |
| parent | 3a8b280c06f8629df845d7eacd89dd871d83c9cf (diff) | |
| parent | b5889d6ffe2a91ccb223a84a220cb1580bc42929 (diff) | |
| download | nextcloud-server-c24752dc1d114b22ff38792c04561c456ea8701d.tar.gz nextcloud-server-c24752dc1d114b22ff38792c04561c456ea8701d.zip | |
Merge branch 'master' into calendar_export
Diffstat (limited to 'apps/calendar/lib')
| -rw-r--r-- | apps/calendar/lib/app.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 2cd28c0f782..ff7ad1cb937 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -377,8 +377,8 @@ class OC_Calendar_App{ $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0; $output = array('id'=>(int)$event['id'], - 'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')), - 'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'', + 'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'), + 'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'', 'lastmodified'=>$lastmodified); $dtstart = $vevent->DTSTART; |