mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-10 21:45:35 +00:00
Merge commit '9ebd6d6b0fee486e1cb935cc7b5376d27ca99fd4'
# Conflicts: # resources/vanilla
This commit is contained in:
commit
dec500bbdd
@ -145,7 +145,6 @@ abstract class Timezone{
|
|||||||
return trim($data);
|
return trim($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// RHEL / CentOS
|
// RHEL / CentOS
|
||||||
$data = @parse_ini_file('/etc/sysconfig/clock');
|
$data = @parse_ini_file('/etc/sysconfig/clock');
|
||||||
if($data !== false and isset($data['ZONE']) and is_string($data['ZONE'])){
|
if($data !== false and isset($data['ZONE']) and is_string($data['ZONE'])){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user