Merge branch 'hotfix/ZF2-209' of https://github.com/mpinkston/zf2 int…

…o hotfix/zf2-209
Hanssillekens · Mar 23, 2012 · 2c4fdd4 · 2c4fdd4
2 parents 647f23a + faf3829
commit 2c4fdd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
@@ -294,13 +294,13 @@ public function route(MvcEvent $e)
         $routeMatch = $router->match($request);
 
         if (!$routeMatch instanceof Router\RouteMatch) {
-            $e->setError(static::ERROR_CONTROLLER_NOT_FOUND);
+            $e->setError(static::ERROR_ROUTER_NO_MATCH);
 
             $results = $this->events()->trigger('dispatch.error', $e);
             if (count($results)) {
                 $return  = $results->last();
             } else {
-                $return = $error->getParams();
+                $return = $e->getParams();
             }
             return $return;
         }

diff --git a/library/Zend/Mvc/View/ExceptionStrategy.php b/library/Zend/Mvc/View/ExceptionStrategy.php
@@ -153,6 +153,7 @@ public function prepareExceptionViewModel(MvcEvent $e)
         switch ($error) {
             case Application::ERROR_CONTROLLER_NOT_FOUND:
             case Application::ERROR_CONTROLLER_INVALID:
+            case Application::ERROR_ROUTER_NO_MATCH:
                 // Specifically not handling these
                 return;