From 558bc0cdebd91df9dcaededc22251d6bb29b1671 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Fri, 19 Aug 2011 16:25:39 +0000
Subject: [PATCH] 2011-08-19  Sancho Lerena <slerena@artica.es>

        * include/config_process.php: Fixed problem with timezone on
        page load in setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4787 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                  |  5 +++++
 pandora_console/include/config_process.php | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 75e6b3b099..0257bd7bbe 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Sancho Lerena <slerena@artica.es>
+
+	* include/config_process.php: Fixed problem with timezone on page load
+	in setup.
+
 2011-08-19  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_graph.php: in function "graphic_agentaccess" fixed when
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 52b890347a..508e70c717 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -25,6 +25,8 @@
 $build_version = 'PC110121';
 $pandora_version = 'v4.0dev';
 
+date_default_timezone_set("Europe/Berlin");
+
 /* Help to debug problems. Override global PHP configuration */
 if (!isset($develop_bypass)) $develop_bypass = 0;
 
@@ -78,6 +80,12 @@ require_once ($ownDir. 'functions_config.php');
 
 config_process_config();
 
+// Set a the system timezone default 
+if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
+	$config["timezone"] = "Europe/Berlin";
+}
+date_default_timezone_set($config["timezone"]);
+
 require_once ($ownDir . 'streams.php');
 require_once ($ownDir . 'gettext.php');
 
@@ -88,13 +96,6 @@ else {
 	$config["remote_addr"] = null;
 }
 
-// Set a the system timezone default 
-if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
-	$config["timezone"] = "Europe/Berlin";
-}
-
-date_default_timezone_set($config["timezone"]);
-
 // Save the global values
 $config["global_block_size"] = $config["block_size"];
 $config["global_flash_charts"] = $config["flash_charts"];