iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ini timezone setting

This commit is contained in:
Igor Scheller 2019-06-04 15:26:45 +02:00 committed by msquare
parent 236197faf8
commit 94fea1edad
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.default.php
View File

@ -115,7 +115,7 @@ return [
'max_freeloadable_shifts' => 2, 'max_freeloadable_shifts' => 2,
// Local timezone // Local timezone
'timezone' => env('TIMEZONE', 'Europe/Berlin'), 'timezone' => env('TIMEZONE', ini_get('date.timezone') ?: 'Europe/Berlin'),
// Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 // Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2
'night_shifts' => [ 'night_shifts' => [

3
includes/application.php
View File

@ -24,7 +24,8 @@ $app->bootstrap($appConfig);
/** /**
* Configure application * Configure application
*/ */
date_default_timezone_set($app->get('config')->get('timezone')); $timezone = $app->get('config')->get('timezone');
ini_set('date.timezone', $timezone);
if (config('environment') == 'development') { if (config('environment') == 'development') {
$errorHandler = $app->get('error.handler'); $errorHandler = $app->get('error.handler');