|
|
@@ -95,7 +95,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
|
|
|
require_once 'Zend/Controller/Router/Route/Module.php';
|
|
|
$compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request);
|
|
|
|
|
|
- $this->_routes = array_merge(array('default' => $compat), $this->_routes);
|
|
|
+ $this->_routes = array('default' => $compat) + $this->_routes;
|
|
|
}
|
|
|
|
|
|
return $this;
|
|
|
@@ -382,7 +382,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
|
|
|
// Find the matching route
|
|
|
$routeMatched = false;
|
|
|
|
|
|
- foreach (array_reverse($this->_routes) as $name => $route) {
|
|
|
+ foreach (array_reverse($this->_routes, true) as $name => $route) {
|
|
|
// TODO: Should be an interface method. Hack for 1.0 BC
|
|
|
if (method_exists($route, 'isAbstract') && $route->isAbstract()) {
|
|
|
continue;
|