Browse Source

Merge pull request #1711 from torm3nt/master

Event firing of 500s now passes along the $exception object
Taylor Otwell 12 years ago
parent
commit
7fe61b74d6
2 changed files with 4 additions and 3 deletions
  1. 3 2
      application/routes.php
  2. 1 1
      laravel/error.php

+ 3 - 2
application/routes.php

@@ -48,7 +48,8 @@ Route::get('/', function()
 |
 |
 | Similarly, we use an event to handle the display of 500 level errors
 | Similarly, we use an event to handle the display of 500 level errors
 | within the application. These errors are fired when there is an
 | within the application. These errors are fired when there is an
-| uncaught exception thrown in the application.
+| uncaught exception thrown in the application. The exception object
+| that is captured during execution is then passed to the 500 listener.
 |
 |
 */
 */
 
 
@@ -57,7 +58,7 @@ Event::listen('404', function()
 	return Response::error('404');
 	return Response::error('404');
 });
 });
 
 
-Event::listen('500', function()
+Event::listen('500', function($exception)
 {
 {
 	return Response::error('500');
 	return Response::error('500');
 });
 });

+ 1 - 1
laravel/error.php

@@ -54,7 +54,7 @@ class Error {
 		// Using events gives the developer more freedom.
 		// Using events gives the developer more freedom.
 		else
 		else
 		{
 		{
-			$response = Event::first('500');
+			$response = Event::first('500', $exception);
 
 
 			$response = Response::prepare($response);
 			$response = Response::prepare($response);
 		}
 		}