From f8468b4c3aeeb51f485c6bb7107f5b64a9643c85 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 29 Sep 2014 23:36:41 -0700
Subject: allow custom role permissions and fix site timezone.

---
 boot.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'boot.php')

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();
-- 
cgit v1.2.3