mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 09:23:28 +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;
|
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)
|
protected static function parseStartDuration(array $data)
|
||||||
{
|
{
|
||||||
$parsed = [];
|
$parsed = [];
|
||||||
@ -996,8 +982,6 @@ class JsCalendar extends JsBase
|
|||||||
|
|
||||||
// adding excludes to the overrides
|
// adding excludes to the overrides
|
||||||
if (!empty($event['recur_type']) && !empty($event['recur_exception']))
|
if (!empty($event['recur_type']) && !empty($event['recur_exception']))
|
||||||
{
|
|
||||||
foreach ($event['recur_exception'] as $timestamp)
|
|
||||||
{
|
{
|
||||||
foreach ($event['recur_exception'] as $timestamp)
|
foreach ($event['recur_exception'] as $timestamp)
|
||||||
{
|
{
|
||||||
@ -1011,7 +995,6 @@ class JsCalendar extends JsBase
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// adding exceptions to the overrides
|
// adding exceptions to the overrides
|
||||||
foreach($exceptions as $exception)
|
foreach($exceptions as $exception)
|
||||||
|
Loading…
Reference in New Issue
Block a user