diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-25 14:02:40 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-25 14:02:40 +0200 |
| commit | ac0c5ba6daf5ffe84088571ea307f5223bd1049a (patch) | |
| tree | c1d51a3f52832dc11cd2648c35edb93e47c148fc /apps/calendar/ajax | |
| parent | 8e8c4a8edc630ff833361c067da5e0d30e94c6d1 (diff) | |
| parent | 34c08b3165ff7ee024006b4c425130fde057863c (diff) | |
| download | nextcloud-server-ac0c5ba6daf5ffe84088571ea307f5223bd1049a.tar.gz nextcloud-server-ac0c5ba6daf5ffe84088571ea307f5223bd1049a.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/calendar/ajax')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index dff02e15875..724cde45669 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -8,11 +8,13 @@ require_once ('../../../lib/base.php'); require_once('when/When.php'); - +$l = new OC_L10N('calendar'); +$unnamed = $l->t('unnamed'); function create_return_event($event, $vevent){ $return_event = array(); + global $unnamed; $return_event['id'] = (int)$event['id']; - $return_event['title'] = htmlspecialchars($event['summary']); + $return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: $unnamed); $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):''; $last_modified = $vevent->__get('LAST-MODIFIED'); if ($last_modified){ |