Skip to content

Commit dc5aefb

Browse files
author
Marius Cramer
committed
Merge branch 'fix-installer-timezone-detection' into 'master'
Fix Installer Timezone Detection Fixes http://bugtracker.ispconfig.org/index.php?do=details&task_id=3389
2 parents 6fe5bbc + ff68e56 commit dc5aefb

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

install/lib/install.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,7 @@ function get_system_timezone() {
812812
if(!$timezone && is_link('/etc/localtime')) {
813813
$timezone = readlink('/etc/localtime');
814814
$timezone = str_replace('/usr/share/zoneinfo/', '', $timezone);
815+
$timezone = str_replace('..', '', $timezone);
815816
if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6);
816817
} elseif(!$timezone) {
817818
$hash = md5_file('/etc/localtime');

0 commit comments

Comments
 (0)