Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev/sabre-vobject3' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into dev/sabre-vobject3

Browse source 
after rebasing with master

Conflicts:
	plugins/libcalendaring/libvcalendar.php
	plugins/libcalendaring/tests/libvcalendar.php
This commit is contained in:
Thomas Bruederli 2015-04-02 16:12:42 +02:00
commit d99b8f8fee
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/libcalendaring/libvcalendar.php
View file

@ -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;

2
plugins/libcalendaring/tests/libvcalendar.php
View file

@ -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");
}