Permalink
Browse files

Merge branch 'hotfix/3052' into develop

Forward port #3052
  • Loading branch information...
2 parents 38e7d8a + 6578978 commit e9c2914329bf62f3af03e5c37f1c4d39ba7bcbaa @weierophinney weierophinney committed Dec 10, 2012
Showing with 5 additions and 1 deletion.
  1. +2 −0 library/Zend/Navigation/Page/Mvc.php
  2. +3 −1 tests/ZendTest/Navigation/Page/MvcTest.php
@@ -440,6 +440,8 @@ public function toArray()
'controller' => $this->getController(),
'params' => $this->getParams(),
'route' => $this->getRoute(),
+ 'router' => $this->getRouter(),
+ 'route_match' => $this->getRouteMatch(),
)
);
}
@@ -418,7 +418,9 @@ public function testToArrayMethod()
'active' => true,
'visible' => false,
'foo' => 'bar',
- 'meaning' => 42
+ 'meaning' => 42,
+ 'router' => $this->router,
+ 'route_match' => $this->routeMatch,
);
$page = new Page\Mvc($options);

0 comments on commit e9c2914

Please sign in to comment.