Merge branch 'master' into api3/network

This commit is contained in:
Dylan K. Taylor
2017-03-25 21:26:46 +00:00
20 changed files with 128 additions and 46 deletions

View File

@ -143,7 +143,7 @@ class CrashDump{
$error = $lastExceptionError;
}else{
$error = (array) error_get_last();
$error["trace"] = @getTrace(3);
$error["trace"] = getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
$errorConversion = [
E_ERROR => "E_ERROR",
E_WARNING => "E_WARNING",