Merge branch 'master' into develop

b2c29629 · Taylor Otwell · 9da5d30b · 35acc540 · b2c29629
Commit b2c29629 authored Feb 06, 2015 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

Handler.php app/Exceptions/Handler.php +1 -8

No files found.
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -36,14 +36,7 @@ class Handler extends ExceptionHandler {
 	 */
 	public function render($request, Exception $e)
 	{
-		if ($this->isHttpException($e))
-		{
-			return $this->renderHttpException($e);
-		}
-		else
-		{
-			return parent::render($request, $e);
-		}
+		return parent::render($request, $e);
 	}

 }