Removed Timezone warnings

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index edacf4a4f17430d65c84ba03ec92442ebf7ad21a..8d2b12c241a6b02b7f545ea43422837dbeeb77c7 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+12-Dec-2010 Joe hunt
+# Removed Timezone warnings
+$ config.default.php
+  /includes/date_functions.inc
+  
 12-Dec-2010 Janusz Dobrowolski
 # [0000318] Database error after last changes related to bu 313
 $ /purchasing/includes/ui/po_ui.inc

diff --git a/config.default.php b/config.default.php
index 692c87b5ba30d7355fa07da29371133a420821c2..7e8534a6262302cc1e3d783acb7d6baae01f23eb 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -20,6 +20,10 @@
 
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
+
+       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. 
        // Special value 'syslog' can be used for system logger usage (see php manual).

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 64fdfab4b8a28012f9a61e48d5207439e1df85ff..a027f89d86b1332ee63c2853d0aef956ddd41a79 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -18,8 +18,6 @@ this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
 "m/d/Y" for US/Canada format dates depending on setting in preferences.
 
 */
-if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
-       @date_default_timezone_set(@date_default_timezone_get());
 
 function __date($year, $month, $day)
 {