diff options
| author | git-marijus <mario@mariovavti.com> | 2017-06-01 08:16:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 08:16:55 +0200 |
| commit | 2e54024b92b8d1a86771c20831495d498f96d690 (patch) | |
| tree | a96be42ef1e00f370bfba8ddf138917b8e0aa581 /vendor/sabre/vobject/lib/FreeBusyGenerator.php | |
| parent | 14229d0dd3205ea1e85d2c26d6c79bd68d19eda3 (diff) | |
| parent | ea1997128529965fa92f1a182c2a7ad02b88d3e3 (diff) | |
| download | volse-hubzilla-2e54024b92b8d1a86771c20831495d498f96d690.tar.gz volse-hubzilla-2e54024b92b8d1a86771c20831495d498f96d690.tar.bz2 volse-hubzilla-2e54024b92b8d1a86771c20831495d498f96d690.zip | |
Merge pull request #804 from dawnbreak/dev
:arrow_up:Update Sabre libraries.
Diffstat (limited to 'vendor/sabre/vobject/lib/FreeBusyGenerator.php')
| -rw-r--r-- | vendor/sabre/vobject/lib/FreeBusyGenerator.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/sabre/vobject/lib/FreeBusyGenerator.php b/vendor/sabre/vobject/lib/FreeBusyGenerator.php index e33621090..e30b136c4 100644 --- a/vendor/sabre/vobject/lib/FreeBusyGenerator.php +++ b/vendor/sabre/vobject/lib/FreeBusyGenerator.php @@ -2,8 +2,8 @@ namespace Sabre\VObject; -use DateTimeInterface; use DateTimeImmutable; +use DateTimeInterface; use DateTimeZone; use Sabre\VObject\Component\VCalendar; use Sabre\VObject\Recur\EventIterator; @@ -152,7 +152,7 @@ class FreeBusyGenerator { $this->objects = []; foreach ($objects as $object) { - if (is_string($object)) { + if (is_string($object) || is_resource($object)) { $this->objects[] = Reader::read($object); } elseif ($object instanceof Component) { $this->objects[] = $object; @@ -292,7 +292,7 @@ class FreeBusyGenerator { list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd(); if ( (is_null($higherStart) || $higherStart < $compStart) && - (is_null($higherEnd) || $higherEnd > $compEnd) + (is_null($higherEnd) || $higherEnd > $compEnd) ) { // Component is fully covered by a higher priority |