From b769cc8edfc8503055f3b3b5b86b7076e939ad4e Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 11 Mar 2014 15:01:38 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
install/lib/install.lib.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 5de8777..47c4578 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -812,6 +812,7 @@
if(!$timezone && is_link('/etc/localtime')) {
$timezone = readlink('/etc/localtime');
$timezone = str_replace('/usr/share/zoneinfo/', '', $timezone);
+ $timezone = str_replace('..', '', $timezone);
if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6);
} elseif(!$timezone) {
$hash = md5_file('/etc/localtime');
--
Gitblit v1.9.1