mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next-minor'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/network/upnp/UPnP.php
This commit is contained in:
Dylan K. Taylor
2020-05-23 11:16:19 +01:00
parent 14dd7f306b ecbf21acea
commit 0025196a81
6 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/Timezone.php
View File

@@ -103,7 +103,7 @@ abstract class Timezone{
*/
public static function detectSystemTimezone(){
switch(Utils::getOS()){
case 'win':
case Utils::OS_WINDOWS:
$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
/*
@@ -138,7 +138,7 @@ abstract class Timezone{
}
return self::parseOffset($offset);
case 'linux':
case Utils::OS_LINUX:
// Ubuntu / Debian.
$data = @file_get_contents('/etc/timezone');
if($data !== false){
@@ -160,7 +160,7 @@ abstract class Timezone{
}
return self::parseOffset($offset);
case 'mac':
case Utils::OS_MACOS:
$filename = @readlink('/etc/localtime');
if($filename !== false and strpos($filename, '/usr/share/zoneinfo/') === 0){
$timezone = substr($filename, 20);