diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-25 14:02:02 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-25 14:02:02 +0200 |
| commit | 19c101a660e311437bd471f0c87f0a9413351f7f (patch) | |
| tree | 09be642404b56a14e2f7e4e09e426ea9e88c9a68 /apps/calendar | |
| parent | 37963fee28824165d50e8a12c754fb9ee26d89d8 (diff) | |
| parent | 34c08b3165ff7ee024006b4c425130fde057863c (diff) | |
| download | nextcloud-server-19c101a660e311437bd471f0c87f0a9413351f7f.tar.gz nextcloud-server-19c101a660e311437bd471f0c87f0a9413351f7f.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 2 | ||||
| -rw-r--r-- | apps/calendar/lib/app.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 887cf8b2072..196b2c3394f 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -7,7 +7,7 @@ */ require_once ('../../../lib/base.php'); -require_once('../../../3rdparty/when/When.php'); +require_once('when/When.php'); OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 516c04f038a..f50c65ab4f7 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -118,7 +118,7 @@ class OC_Calendar_App{ public static function prepareForOutput($event, $vevent){ $return_event = array(); $return_event['id'] = (int)$event['id']; - $return_event['title'] = htmlspecialchars($event['summary']); + $return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')); $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):''; $last_modified = $vevent->__get('LAST-MODIFIED'); if ($last_modified){ |