summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-04-02 14:12:42 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-04-02 14:12:42 (GMT)
commitd99b8f8fee1d8260e450bb06ce06f2428a78b55e (patch)
treec3685b352dfe2e58f47460fd72a4c224e5f00c32
parente614c87dfe356be942fe6090792deda0b3420506 (diff)
parent963cc3e1f5098490be8cf5f7afea6b8b84358e44 (diff)
downloadroundcubemail-plugins-kolab-d99b8f8fee1d8260e450bb06ce06f2428a78b55e.tar.gz
Merge branch 'dev/sabre-vobject3' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into dev/sabre-vobject3
after rebasing with master Conflicts: plugins/libcalendaring/libvcalendar.php plugins/libcalendaring/tests/libvcalendar.php
-rw-r--r--plugins/libcalendaring/libvcalendar.php2
-rw-r--r--plugins/libcalendaring/tests/libvcalendar.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index ac04e87..6981a27 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -483,7 +483,7 @@ class libvcalendar implements Iterator
case 'RELATED-TO':
$reltype = $prop->offsetGet('RELTYPE');
if ($reltype == 'PARENT' || $reltype === null) {
- $event['parent_id'] = $prop->value;
+ $event['parent_id'] = $value;
}
break;
diff --git a/plugins/libcalendaring/tests/libvcalendar.php b/plugins/libcalendaring/tests/libvcalendar.php
index f97513a..d401a96 100644
--- a/plugins/libcalendaring/tests/libvcalendar.php
+++ b/plugins/libcalendaring/tests/libvcalendar.php
@@ -469,8 +469,6 @@ class libvcalendar_test extends PHPUnit_Framework_TestCase
$this->assertContains('RECURRENCE-ID;TZID=Europe/Zurich:20130814', $ics, "Recurrence-ID (1) being the exception date");
$this->assertContains('RECURRENCE-ID;TZID=Europe/Zurich:20131113', $ics, "Recurrence-ID (2) being the exception date");
- $this->assertContains('RECURRENCE-ID:20130814', $ics, "Recurrence-ID (1) being the exception date");
- $this->assertContains('RECURRENCE-ID:20131113', $ics, "Recurrence-ID (2) being the exception date");
$this->assertContains('SUMMARY:'.$exception2['title'], $ics, "Exception title");
}