diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-26 14:15:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-26 14:15:07 +0200 |
| commit | c7de74c4719c5825063d60b808932b53c01f3f1c (patch) | |
| tree | 86063f8dd3cce5e98698f20abddcfb5cf4960363 /apps/calendar/lib | |
| parent | 17e289aef25ada35fc5e654d39fd17006e5b82f1 (diff) | |
| parent | 72b365842f03d01e1479578ae36f5074d793e702 (diff) | |
| download | nextcloud-server-c7de74c4719c5825063d60b808932b53c01f3f1c.tar.gz nextcloud-server-c7de74c4719c5825063d60b808932b53c01f3f1c.zip | |
Merge branch 'master' into calendar_export
Diffstat (limited to 'apps/calendar/lib')
| -rw-r--r-- | apps/calendar/lib/app.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 8e13b13b8a3..344c89f36b0 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -194,6 +194,9 @@ class OC_Calendar_App{ } else if (isset($calendar->VTODO)) { $object = $calendar->VTODO; + } else + if (isset($calendar->VJOURNAL)) { + $object = $calendar->VJOURNAL; } if ($object) { self::getVCategories()->loadFromVObject($object, true); |