Merge from upstream

1 files changed, 2 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index dc94f202e..563ed0fe1 100755
--- a/boot.php
+++ b/boot.php
@@ -716,10 +716,8 @@ class App {
 
 	function __construct() {
 
-		global $default_timezone;
-		$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
-
-		date_default_timezone_set($this->timezone);
+		// we'll reset this after we read our config file
+		date_default_timezone_set('UTC');
 
 		$this->config = array('system'=>array());
 		$this->page = array();