mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-16 19:59:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8726604899d1a371567141e0831ed570d3233356'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-12-25 14:19:35 +00:00
parent 27fa73a4d2 8726604899
commit 0f718ea28b
16 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/Config.php
View File

@@ -405,7 +405,7 @@ class Config{
while(count($vars) > 0){
$nodeName = array_shift($vars);
if(isset($currentNode[$nodeName])){
if(empty($vars)){ //final node
if(count($vars) === 0){ //final node
unset($currentNode[$nodeName]);
}elseif(is_array($currentNode[$nodeName])){
$currentNode =& $currentNode[$nodeName];

3
src/utils/Timezone.php
View File

@@ -33,6 +33,7 @@ use function implode;
use function ini_get;
use function ini_set;
use function is_link;
use function is_string;
use function json_decode;
use function parse_ini_file;
use function preg_match;
@@ -144,7 +145,7 @@ abstract class Timezone{
// RHEL / CentOS
if(file_exists('/etc/sysconfig/clock')){
$data = parse_ini_file('/etc/sysconfig/clock');
if(!empty($data['ZONE'])){
if(isset($data['ZONE']) and is_string($data['ZONE'])){
return trim($data['ZONE']);
}
}