From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 install/lib/install.lib.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 30ba04e..eac79e9 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -811,6 +811,8 @@
 		exec('date +%Z', $tzinfo);
 		$timezone = $tzinfo[0];
 	}
+	
+	if(substr($timezone, 0, 1) === '/') $timezone = substr($timezone, 1);
 
 	return $timezone;
 }

--
Gitblit v1.9.1