Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Don't show the trace on shutdown, it's useless.
This commit is contained in:
Taylor Otwell 2012-04-19 06:26:59 -07:00
parent 3670423da6 56fac668b3
commit cac5ebad4a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/error.php
View File

@ -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 @@ public static function exception($exception)
<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 @@ public static function shutdown()
{ {
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);
} }
} }