Commit cac5ebad authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #507 from sparksp/develop-patch-2

Don't show the trace on shutdown, it's useless.
parents 3670423d 56fac668
...@@ -8,7 +8,7 @@ class Error { ...@@ -8,7 +8,7 @@ class Error {
* @param Exception $exception * @param Exception $exception
* @return void * @return void
*/ */
public static function exception($exception) public static function exception($exception, $trace = true)
{ {
static::log($exception); static::log($exception);
...@@ -23,10 +23,14 @@ class Error { ...@@ -23,10 +23,14 @@ class Error {
<h3>Message:</h3> <h3>Message:</h3>
<pre>".$exception->getMessage()."</pre> <pre>".$exception->getMessage()."</pre>
<h3>Location:</h3> <h3>Location:</h3>
<pre>".$exception->getFile()." on line ".$exception->getLine()."</pre> <pre>".$exception->getFile()." on line ".$exception->getLine()."</pre>";
if ($trace)
{
echo "
<h3>Stack Trace:</h3> <h3>Stack Trace:</h3>
<pre>".$exception->getTraceAsString()."</pre></html>"; <pre>".$exception->getTraceAsString()."</pre></html>";
} }
}
// If we're not using detailed error messages, we'll use the event // If we're not using detailed error messages, we'll use the event
// system to get the response that should be sent to the browser. // system to get the response that should be sent to the browser.
...@@ -83,7 +87,7 @@ class Error { ...@@ -83,7 +87,7 @@ class Error {
{ {
extract($error, EXTR_SKIP); extract($error, EXTR_SKIP);
static::exception(new \ErrorException($message, $type, 0, $file, $line)); static::exception(new \ErrorException($message, $type, 0, $file, $line), false);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment