Merge branch 'hotfix/125' into develop

Forward port #125
zendframework · Sep 10, 2015 · 51e76df · 51e76df
2 parents 1ceee91 + 680a5f7
commit 51e76df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#125](https://github.com/zendframework/zend-expressive/pull/125) fixes the
+  `WhoopsErrorHandler` to ensure it pushes the "pretty page handler" into the
+  Whoops runtime.
 
 ## 0.2.0 - 2015-09-03
 

diff --git a/src/WhoopsErrorHandler.php b/src/WhoopsErrorHandler.php
@@ -77,6 +77,8 @@ protected function handleException(\Exception $exception, Request $request, Resp
     {
         $this->prepareWhoopsHandler($request);
 
+        $this->whoops->pushHandler($this->whoopsHandler);
+
         $response
             ->getBody()
             ->write($this->whoops->handleException($exception));