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

Fixed crash reports using invalid lastError data

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-28 15:41:13 +02:00
parent 9124513584
commit d0936329aa
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/CrashDump.php
View File

@ -131,9 +131,7 @@ class CrashDump{
private function baseCrash(){ private function baseCrash(){
global $lastError; global $lastError;
if(isset($lastError)){
$error = $lastError;
}else{
$error = (array) error_get_last(); $error = (array) error_get_last();
$error["trace"] = getTrace(4); $error["trace"] = getTrace(4);
$errorConversion = array( $errorConversion = array(
@ -159,6 +157,9 @@ class CrashDump{
if(($pos = strpos($error["message"], "\n")) !== false){ if(($pos = strpos($error["message"], "\n")) !== false){
$error["message"] = substr($error["message"], 0, $pos); $error["message"] = substr($error["message"], 0, $pos);
} }
if(isset($lastError)){
$this->data["lastError"] = $lastError;
} }
$this->data["error"] = $error; $this->data["error"] = $error;

4
src/pocketmine/PocketMine.php
View File

@ -142,13 +142,13 @@ namespace pocketmine {
} }
gc_disable(); gc_disable();
error_reporting(E_ALL | E_STRICT); error_reporting(-1);
ini_set("allow_url_fopen", 1); ini_set("allow_url_fopen", 1);
ini_set("display_errors", 1); ini_set("display_errors", 1);
ini_set("display_startup_errors", 1); ini_set("display_startup_errors", 1);
ini_set("default_charset", "utf-8"); ini_set("default_charset", "utf-8");
ini_set("memory_limit", "128M"); //Default ini_set("memory_limit", "256M"); //Default
define("pocketmine\\START_TIME", microtime(true)); define("pocketmine\\START_TIME", microtime(true));
$opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard")); $opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard"));