mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:07 +01:00
fix diff to master
This commit is contained in:
parent
0905d8f4aa
commit
70dbebae41
@ -556,20 +556,6 @@ class JsCalendar extends JsBase
|
||||
return $duration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse a DateTime value
|
||||
*
|
||||
* @param string $value
|
||||
* @param string|null $timezone
|
||||
* @param bool $showWithoutTime true: return H:i set to 00:00
|
||||
* @return Api\DateTime
|
||||
* @throws Api\Exception
|
||||
*/
|
||||
protected static function parseDateTime(string $value, ?string $timezone=null, bool $showWithoutTime=false)
|
||||
{
|
||||
return new Api\DateTime($value, !empty($timezone) ? new \DateTimeZone($timezone) : null);
|
||||
}
|
||||
|
||||
protected static function parseStartDuration(array $data)
|
||||
{
|
||||
$parsed = [];
|
||||
@ -999,17 +985,14 @@ class JsCalendar extends JsBase
|
||||
{
|
||||
foreach ($event['recur_exception'] as $timestamp)
|
||||
{
|
||||
foreach ($event['recur_exception'] as $timestamp)
|
||||
$ex_date = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
|
||||
if (!empty($event['whole_day']))
|
||||
{
|
||||
$ex_date = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
|
||||
if (!empty($event['whole_day']))
|
||||
{
|
||||
$ex_date->setTime(0, 0, 0);
|
||||
}
|
||||
$overrides[self::DateTime($ex_date, $event['tzid'])] = [
|
||||
'excluded' => true,
|
||||
];
|
||||
$ex_date->setTime(0, 0, 0);
|
||||
}
|
||||
$overrides[self::DateTime($ex_date, $event['tzid'])] = [
|
||||
'excluded' => true,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user