David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Matthew Machuga 12 years ago
parent
d693a82615
commit
24ba947d10
1 changed files with 15 additions and 8 deletions
Split View Show Diff Stats
  1. 15 8
      laravel/error.php

+ 15 - 8
laravel/error.php
View File 

@@ -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 {
 
 		}
 
 	}
 
 
-}
 
+}