diff options
author | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
commit | a8d81a68d62e982094110a340341756fbb6df4a9 (patch) | |
tree | 51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/sabre/vobject/lib/ITip | |
parent | abe6ab477531916158c04e3d387cb02e839d28b6 (diff) | |
parent | 09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff) | |
download | volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2 volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/sabre/vobject/lib/ITip')
-rw-r--r-- | vendor/sabre/vobject/lib/ITip/Broker.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/vendor/sabre/vobject/lib/ITip/Broker.php b/vendor/sabre/vobject/lib/ITip/Broker.php index effa74317..b9a30611b 100644 --- a/vendor/sabre/vobject/lib/ITip/Broker.php +++ b/vendor/sabre/vobject/lib/ITip/Broker.php @@ -849,6 +849,7 @@ class Broker { $exdate = []; foreach ($calendar->VEVENT as $vevent) { + $rrule = []; if (is_null($uid)) { $uid = $vevent->UID->getValue(); @@ -889,6 +890,18 @@ class Broker { } sort($exdate); } + if (isset($vevent->RRULE)) { + foreach ($vevent->select('RRULE') as $rr) { + foreach ($rr->getParts() as $key => $val) { + // ignore default values (https://github.com/sabre-io/vobject/issues/126) + if ($key === 'INTERVAL' && $val == 1) { + continue; + } + $rrule[] = "$key=$val"; + } + } + sort($rrule); + } if (isset($vevent->STATUS)) { $status = strtoupper($vevent->STATUS->getValue()); } @@ -953,19 +966,16 @@ class Broker { $significantChangeHash .= $prop . ':'; if ($prop === 'EXDATE') { - $significantChangeHash .= implode(',', $exdate) . ';'; - + } elseif ($prop === 'RRULE') { + $significantChangeHash .= implode(',', $rrule) . ';'; } else { - foreach ($propertyValues as $val) { $significantChangeHash .= $val->getValue() . ';'; } - } } } - } $significantChangeHash = md5($significantChangeHash); |