Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable

diff --git a/config.default.php b/config.default.php
index ba6eadcb2642b3aecc4e990dcd31a7214ce5dbc1..0d49bbc26d609fdf00ef1a621ac9cd5d37907225 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -21,9 +21,9 @@
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
 
-       // Server time zone. If leaved empty the time zone set in php init file will be used.
-       // If timezone is not set in this file nor in php.ini, Europe/Berlin' is used as defualt.
-       $server_time_zone = '';
+       // Server time zone. Since php 5.3.0 time zone have to be set either here or in server php ini file
+       if (!ini_get('date.timezone'))
+               ini_set('date.timezone', 'Europe/Berlin');
 
        // Log file for error/warning messages. Should be set to any location
        // writable by www server. When set to empty string logging is switched off.