diff options
| author | msquare <msquare@notrademark.de> | 2016-11-09 17:43:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 17:43:56 +0100 |
| commit | d43eb41d25d0d5c0509417247030dd6c21118cf6 (patch) | |
| tree | 2c3f78bf8fbd4215e70af7dbc2ce30cfef674816 /includes/pages/admin_import.php | |
| parent | d5d2acc7d80920eef5f0ed779a3738a12d5db348 (diff) | |
| parent | 22520532c78b3a032aec6ececb7623ba094da8de (diff) | |
Merge pull request #274 from engelsystem/task-164-shift-view
Task 164 shift view
Diffstat (limited to 'includes/pages/admin_import.php')
| -rw-r--r-- | includes/pages/admin_import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php index 2c36e681..4af09dca 100644 --- a/includes/pages/admin_import.php +++ b/includes/pages/admin_import.php @@ -312,8 +312,8 @@ function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_e 'event-id' }); $shifts_pb[$event_id] = [ 'shifttype_id' => $shifttype_id, - 'start' => DateTime::createFromFormat("Ymd\THis", $event->dtstart)->getTimestamp() - $add_minutes_start * 60, - 'end' => DateTime::createFromFormat("Ymd\THis", $event->dtend)->getTimestamp() + $add_minutes_end * 60, + 'start' => parse_date("Ymd\THis", $event->dtstart) - $add_minutes_start * 60, + 'end' => parse_date("Ymd\THis", $event->dtend) + $add_minutes_end * 60, 'RID' => $rooms_import[trim($event->location)], 'title' => trim($event->summary), 'URL' => trim($event->url), |