2
0
Просмотр исходного кода

merge r25070 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25071 44c647ce-9c0f-0410-b52a-842ac1e357ba
rob 13 лет назад
Родитель
Сommit
e200ed997a
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      library/Zend/Controller/Router/Route/Chain.php

+ 5 - 4
library/Zend/Controller/Router/Route/Chain.php

@@ -72,9 +72,10 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
      */
      */
     public function match($request, $partial = null)
     public function match($request, $partial = null)
     {
     {
-        $path    = trim($request->getPathInfo(), self::URI_DELIMITER);
-        $subPath = $path;
-        $values  = array();
+        $path      = trim($request->getPathInfo(), self::URI_DELIMITER);
+        $subPath   = $path;
+        $values    = array();
+        $numRoutes = count($this->_routes);
 
 
         foreach ($this->_routes as $key => $route) {
         foreach ($this->_routes as $key => $route) {
             if ($key > 0
             if ($key > 0
@@ -99,7 +100,7 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
                 $match = $request;
                 $match = $request;
             }
             }
 
 
-            $res = $route->match($match, true);
+            $res = $route->match($match, true, ($key == $numRoutes - 1));
             if ($res === false) {
             if ($res === false) {
                 return false;
                 return false;
             }
             }