Merge remote-tracking branch 'weierophinney/hotfix/zf2-422'

lookatitude · Jul 26, 2012 · ae4ce57 · ae4ce57
2 parents efe1d76 + 355607c
commit ae4ce57
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/library/Zend/Mvc/View/Http/ViewManager.php b/library/Zend/Mvc/View/Http/ViewManager.php
@@ -334,16 +334,21 @@ public function getRouteNotFoundStrategy()
 
         $this->routeNotFoundStrategy = new RouteNotFoundStrategy();
 
+        $displayExceptions     = false;
         $displayNotFoundReason = false;
         $notFoundTemplate      = '404';
 
+        if (isset($this->config['display_exceptions'])) {
+            $displayExceptions = $this->config['display_exceptions'];
+        }
         if (isset($this->config['display_not_found_reason'])) {
             $displayNotFoundReason = $this->config['display_not_found_reason'];
         }
         if (isset($this->config['not_found_template'])) {
             $notFoundTemplate = $this->config['not_found_template'];
         }
 
+        $this->routeNotFoundStrategy->setDisplayExceptions($displayExceptions);
         $this->routeNotFoundStrategy->setDisplayNotFoundReason($displayNotFoundReason);
         $this->routeNotFoundStrategy->setNotFoundTemplate($notFoundTemplate);