summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-06-24 22:15:36 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-06-24 22:25:32 +0200
commitdf1eca4fa2876da3507b51a5a47683284e887c7a (patch)
treea65ba6448dafbac48d6579e910aae833d10f075f /apps
parent2a6a155e23626fbbc4b04917b52e2f918e10effc (diff)
downloadnextcloud-server-df1eca4fa2876da3507b51a5a47683284e887c7a.tar.gz
nextcloud-server-df1eca4fa2876da3507b51a5a47683284e887c7a.zip
Also load categories from VJOURNAL.
Diffstat (limited to 'apps')
-rw-r--r--apps/calendar/lib/app.php3
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);