rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for CATEGORIES before using it

master
Thomas Tanghus 2013-09-25 18:47:22 +02:00
parent 6d05bcba0b
commit 2a322c63bd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/app.php
View File

@ -194,8 +194,8 @@ class OC_Calendar_App{
if (isset($calendar->VJOURNAL)) {
$object = $calendar->VJOURNAL;
}
if ($object) {
$vcategories->loadFromVObject($event['id'], $vobject, true);
if ($object && isset($object->CATEGORIES)) {
$vcategories->addMulti($object->CATEGORIES->getParts(), true, $event['id']);
}
}
}
@ -204,7 +204,7 @@ class OC_Calendar_App{
/**
* check VEvent for new categories.
* @see OC_VCategories::loadFromVObject
* @see OC_VCategories::addMulti
*/
public static function loadCategoriesFromVCalendar($id, OC_VObject $calendar) {
$object = null;
@ -217,8 +217,8 @@ class OC_Calendar_App{
if (isset($calendar->VJOURNAL)) {
$object = $calendar->VJOURNAL;
}
if ($object) {
self::getVCategories()->loadFromVObject($id, $object, true);
if ($object && isset($object->CATEGORIES)) {
self::getVCategories()->addMulti($object->CATEGORIES->getParts(), true, $event['id']);
}
}