From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 22 May 2017 12:47:32 +0000 (+0200)
Subject: Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable
X-Git-Tag: v2.4.2~19^2~2
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7705a766b36239b2622c1b269292ec6e12f2ca09;hp=615c63fbc4aea4d0e136e868993e71190aacadd2;p=fa-stable.git

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 ba6eadcb..0d49bbc2 100644
--- 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.