Merge branch 'hotfix/1.1.6'

pingthepeople · May 4, 2017 · f4c91e2 · f4c91e2
2 parents 6f05756 + 4a54c24
commit f4c91e2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -60,7 +60,13 @@ public function report(Exception $exception)
     public function render($request, Exception $exception)
     {
         if(env('APP_DEBUG', false)==false) {
-            if (!$this->isHttpException($exception)) $exception = new HttpException(500);
+            // for any exception other than HttpException, AuthenticationException, and ValidationException,
+            // return an HttpException to display an error page
+            if (!($exception instanceof HttpException)
+                && !($exception instanceof AuthenticationException)
+                && !($exception instanceof ValidationException)) {
+                    $exception = new HttpException(500);
+            }
         }
 
         return parent::render($request, $exception);