mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

Fixed error_handler trace generation on higher debug levels

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-15 17:58:03 +02:00
parent ed942100ec
commit 1adf53a81e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -327,9 +327,9 @@ namespace pocketmine {
return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/"); return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
} }
function error_handler($errno, $errstr, $errfile, $errline, $trace = null){ function error_handler($errno, $errstr, $errfile, $errline, $context, $trace = null){
global $lastError; global $lastError;
if(error_reporting() === 0){ //@ error-control if(error_reporting() === 0){ //@ error-con..trol
return false; return false;
} }
$errorConversion = [ $errorConversion = [

2
src/pocketmine/Server.php
View File

@ -1932,7 +1932,7 @@ class Server{
return; return;
} }
error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTrace()); error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), [], $e->getTrace());
global $lastExceptionError, $lastError; global $lastExceptionError, $lastError;
$lastExceptionError = $lastError; $lastExceptionError = $lastError;
$this->crashDump(); $this->crashDump();