Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/3052' into develop

Forward port #3052
  • Loading branch information...
commit 9f129fc597f87feaa2f936fd312c46a62f8d7960 2 parents 852b3f5 + 9e0e570
@weierophinney weierophinney authored
View
2  library/Zend/Navigation/Page/Mvc.php
@@ -440,6 +440,8 @@ public function toArray()
'controller' => $this->getController(),
'params' => $this->getParams(),
'route' => $this->getRoute(),
+ 'router' => $this->getRouter(),
+ 'route_match' => $this->getRouteMatch(),
)
);
}
View
4 tests/ZendTest/Navigation/Page/MvcTest.php
@@ -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);
Please sign in to comment.
Something went wrong with that request. Please try again.