Merge pull request #49 from smuth4/UTC

Default to UTC for timezone
othmar52 · Jan 1, 2017 · 3a49b22 · 3a49b22
2 parents 0d35b5a + 1961930
commit 3a49b22
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/core/config/config.ini b/core/config/config.ini
@@ -9,9 +9,9 @@ cli-verbosity = 1
 
 ; currently en, de
 langkey = en
-; When disabled, these use the system defaults
+; When disabled, locale is set to the system defaults
 ;locale = de_DE.UTF-8
-;timezone = Europe/Vienna
+timezone = UTC
 
 ; display button for quickly browsing through random items (useful for development)
 showrandomizer = 0

diff --git a/core/config/config_local.sample.ini b/core/config/config_local.sample.ini
@@ -25,9 +25,9 @@ absFilePrefix = /
 
 logomarkup = "<span style='font-size:0.8em'>SLI</span>M<span style='font-size:0.8em'>PD</span>"
 
-; When disabled, these use the system defaults
+; When disabled, locale is set to the system defaults
 ;locale = de_DE.UTF-8
-;timezone = Europe/Vienna
+timezone = UTC
 
 
 [spotcolor]

diff --git a/index.php b/index.php
@@ -43,9 +43,7 @@
 // Timezone needs to be set before session_start, the locale is also set here for convience
 $configLoader = new \Slimpd\Modules\configloader_ini\ConfigLoaderINI(APP_ROOT . 'core/config/');
 $config = $configLoader->loadConfig('master.ini');
-if (isset($config['config']['timezone'])) {
-    date_default_timezone_set($config['config']['timezone']);
-}
+date_default_timezone_set($config['config']['timezone']);
 if (isset($config['config']['locale'])) {
     setlocale(LC_ALL, array($config['config']['locale']));
 }

diff --git a/slimpd b/slimpd
@@ -55,9 +55,7 @@ chdir(dirname(__DIR__));
 // Timezone needs to be set before session_start, the locale is also set here for convience
 $configLoader = new \Slimpd\Modules\configloader_ini\ConfigLoaderINI(APP_ROOT . 'core/config/');
 $config = $configLoader->loadConfig('master.ini');
-if (isset($config['config']['timezone'])) {
-    date_default_timezone_set($config['config']['timezone']);
-}
+date_default_timezone_set($config['config']['timezone']);
 if (isset($config['config']['locale'])) {
     setlocale(LC_ALL, array($config['config']['locale']));
 }