Marius Cramer
2014-03-11 dc5aefbd1d965663a53b0837359be9543740c04b
 Merge branch 'fix-installer-timezone-detection' into 'master'

Fix Installer Timezone Detection

Fixes http://bugtracker.ispconfig.org/index.php?do=details&task_id=3389
1 files modified
1 ■■■■ changed files
install/lib/install.lib.php 1 ●●●● patch | view | raw | blame | history
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');