Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Aug 2013 09:22:42 +0000 (11:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Aug 2013 09:22:42 +0000 (11:22 +0200)
1  2 
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/Model/Event.php

@@@ -323,10 -323,9 +323,10 @@@ class Calendar_Convert_Event_VCalendar_
          $this->assertContains('CREATED;VALUE=DATE-TIME:20111111T111100Z',       $vevent, $vevent);
          $this->assertContains('LAST-MODIFIED;VALUE=DATE-TIME:20111111T121200Z', $vevent, $vevent);
          $this->assertContains('DTSTAMP;VALUE=DATE-TIME:',                       $vevent, $vevent);
-         $this->assertContains('RRULE:FREQ=DAILY;UNTIL=20111112;INTERVAL=1',     $vevent, $vevent);
+         $this->assertContains('RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20111112',     $vevent, $vevent);
          $this->assertContains('EXDATE;VALUE=DATE:20111111',                     $vevent, $vevent);
 -        $this->assertContains('ORGANIZER;CN="' . Tinebase_Core::getUser()->accountDisplayName . '";EMAIL=' . Tinebase_Core::getUser()->accountEmailAddress . ':', $vevent, $vevent);
 +        #$this->assertContains('ORGANIZER;CN="' . Tinebase_Core::getUser()->accountDisplayName . '";EMAIL=' . Tinebase_Core::getUser()->accountEmailAddress . ':', $vevent, $vevent);
 +        $this->assertContains('ORGANIZER;CN=', $vevent, $vevent);
      }
      
      /**
Simple merge