Set the default timezone in index.php

2 files changed, 2 insertions, 3 deletions

diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index 19fecf2b..f99073af 100644
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -66,9 +66,6 @@ class ConfigPhp implements ConfigIO
             }
         }
 
-        // FIXME!
-        //$configStr .= 'date_default_timezone_set('.var_export($conf['timezone'], true).');'. PHP_EOL;
-
         if (!file_put_contents($filepath, $configStr)
             || strcmp(file_get_contents($filepath), $configStr) != 0
         ) {
diff --git a/index.php b/index.php
index 780dc581..aad65559 100644
--- a/index.php
+++ b/index.php
@@ -113,6 +113,8 @@ RainTPL::$cache_dir = $conf->get('config.RAINTPL_TMP'); // cache directory
 $pluginManager = PluginManager::getInstance();
 $pluginManager->load($conf->get('config.ENABLED_PLUGINS'));
 
+date_default_timezone_set($conf->get('timezone', 'UTC'));
+
 ob_start();  // Output buffering for the page cache.
 
 // In case stupid admin has left magic_quotes enabled in php.ini: