Skip to content

U
UserAdminV2
Commit 5059ced2 by Taylor Otwell
Options

Merge pull request #1413 from machuga/develop 

Add 500 response code to exception handler. -- machuga, JesseOBrien, sde...
parents d693a826 24ba947d
Showing with 15 additions and 9 deletions
laravel/error.php
......@@ -30,20 +30,23 @@ class Error {
// If detailed errors are enabled, we'll just format the exception into
// a simple error message and display it on the screen. We don't use a
// View in case the problem is in the View class.
if (Config::get('error.detail'))
{
echo "<html><h2>Unhandled Exception</h2>
<h3>Message:</h3>
<pre>".$message."</pre>
<h3>Location:</h3>
<pre>".$file." on line ".$exception->getLine()."</pre>";
$response_body = "<html><h2>Unhandled Exception</h2>
<h3>Message:</h3>
<pre>".$message."</pre>
<h3>Location:</h3>
<pre>".$file." on line ".$exception->getLine()."</pre>";
if ($trace)
{
echo "
$response_body .= "
<h3>Stack Trace:</h3>
<pre>".$exception->getTraceAsString()."</pre></html>";
}
$response = Response::make($response_body, 500);
}
// If we're not using detailed error messages, we'll use the event
......@@ -53,9 +56,13 @@ class Error {
{
$response = Event::first('500');
echo Response::prepare($response)->render();
$response = Response::prepare($response);
}
$response->render();
$response->send();
$response->foundation->finish();
exit(1);
}
......@@ -119,4 +126,4 @@ class Error {
}
}
}
\ No newline at end of file
}
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