Merge pull request #1413 from machuga/develop

Add 500 response code to exception handler. -- machuga, JesseOBrien, sde...

Merge pull request #1413 from machuga/develop
Add 500 response code to exception handler. -- machuga, JesseOBrien, sde...
5059ced2 · Taylor Otwell · d693a826 · 24ba947d · 5059ced2
Commit 5059ced2 authored Nov 03, 2012 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 8 deletions

error.php laravel/error.php +15 -8

No files found.
--- a/laravel/error.php
+++ b/laravel/error.php
@@ -30,9 +30,10 @@ 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>
+			$response_body = "<html><h2>Unhandled Exception</h2>
 				<h3>Message:</h3>
 				<pre>".$message."</pre>
 				<h3>Location:</h3>
@@ -40,10 +41,12 @@ class Error {
 			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);
 	}