diff options
author | zotlabs <root@sillystring.adeis.uow.edu.au> | 2017-03-16 11:42:06 +1100 |
---|---|---|
committer | zotlabs <root@sillystring.adeis.uow.edu.au> | 2017-03-16 11:42:06 +1100 |
commit | 8d4744d115036dd7ec4169f8b1fdebebac6fb602 (patch) | |
tree | aa8c18d6c51256fb94048dccf0c822b0281ad894 /vendor/sabre/vobject/lib/FreeBusyGenerator.php | |
parent | df6c07aaadda2e89d2843bae136f813c909637ba (diff) | |
download | volse-hubzilla-8d4744d115036dd7ec4169f8b1fdebebac6fb602.tar.gz volse-hubzilla-8d4744d115036dd7ec4169f8b1fdebebac6fb602.tar.bz2 volse-hubzilla-8d4744d115036dd7ec4169f8b1fdebebac6fb602.zip |
new composer.lock for red
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 |