summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-03-23 17:27:52 +0100
committerGeorg Ehrke <dev@georgswebsite.de>2012-03-23 17:27:52 +0100
commit0e11cc9f6ff6176ae723acd8facef9237252be5f (patch)
tree3a06aec6633620a25bd03aceeb596fe62460748d /apps/calendar
parentac8362e34a89b0e513e1304cf0f111c52d27f9e5 (diff)
downloadnextcloud-server-0e11cc9f6ff6176ae723acd8facef9237252be5f.tar.gz
nextcloud-server-0e11cc9f6ff6176ae723acd8facef9237252be5f.zip
fix previous made bug and fix oc bug - oc-139
Diffstat (limited to 'apps/calendar')
-rwxr-xr-xapps/calendar/ajax/events.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index cf768f51c6f..c62f93c540e 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']!=NULL)?$event['summary']:$l->t('unnamed'));
+ $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){