Merge branch 'hotfix/3477'

Close #3477
zendframework · Jan 21, 2013 · 9b7c06c · 9b7c06c
2 parents 91c3b6f + 4eba661
commit 9b7c06c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php b/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
@@ -276,6 +276,8 @@ protected function injectException($model, $e)
             return;
         }
 
+        $model->setVariable('display_exceptions', true);
+
         $exception = $e->getParam('exception', false);
         if (!$exception instanceof \Exception) {
             return;

diff --git a/tests/ZendTest/Mvc/View/RouteNotFoundStrategyTest.php b/tests/ZendTest/Mvc/View/RouteNotFoundStrategyTest.php
@@ -223,6 +223,7 @@ public function test404ResponsePrepares404ViewModelWithExceptionWhenAllowed()
             $this->assertInstanceOf('Zend\View\Model\ModelInterface', $model);
             $variables = $model->getVariables();
             if ($allow) {
+                $this->assertTrue($variables['display_exceptions']);
                 $this->assertTrue(isset($variables['exception']));
                 $this->assertSame($exception, $variables['exception']);
             } else {