mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 08:56:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed cleanPath() not working when the current working dir case doesn't match the actual path case

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-06-22 19:49:27 +01:00
parent 4b4f2af9e3
commit c70690a600
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -108,7 +108,7 @@ namespace pocketmine {
if(\Phar::running(true) !== ""){ if(\Phar::running(true) !== ""){
define('pocketmine\PATH', \Phar::running(true) . "/"); define('pocketmine\PATH', \Phar::running(true) . "/");
}else{ }else{
define('pocketmine\PATH', \getcwd() . DIRECTORY_SEPARATOR); define('pocketmine\PATH', realpath(getcwd()) . DIRECTORY_SEPARATOR);
} }
if(version_compare("7.0", PHP_VERSION) > 0){ if(version_compare("7.0", PHP_VERSION) > 0){
@ -403,7 +403,7 @@ namespace pocketmine {
} }
function cleanPath($path){ function cleanPath($path){
return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/"); return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path);
} }
$exitCode = 0; $exitCode = 0;