Fix for installer timezone detection (Marc Schütz)

696af944 · Marius Cramer · 7ae7e8f7 · 696af944
Commit 696af944 authored Mar 11, 2014 by Marius Cramer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

install/lib/install.lib.php install/lib/install.lib.php +1 -0

No files found.
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -812,6 +812,7 @@ function get_system_timezone() {
 	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');