Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/7425'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed May 6, 2015
170 parents 3af2a53 + 4a6662c + e20e042 + a5555a3 + a2b81c6 + 5711b49 + db8e36b + 9a865bc + 27420a4 + 2e7e46b + f51e1ec + e6b286e + d5c10b6 + 0eabc04 + fed2583 + af2d845 + e8e4ce2 + f4be937 + 9323faa + 65deb5a + d5a4f17 + 94b36e8 + 62824a2 + 6378cbe + a10281c + cd0ff39 + 02e8122 + a667dd4 + 02ccc35 + 7d61487 + ab2f663 + a27ca10 + 75af0e5 + 24f498b + d2dd157 + 6c759d8 + 51b0320 + aabe1c0 + e76b67c + 5d85a78 + d285b08 + c5df6b0 + ff58ff4 + 5675884 + a55ead5 + 47eb5a8 + a36e34a + 3e520ad + 7b0d374 + 461c28b + 3890e69 + 316384e + 1431343 + debad5a + 1680741 + 4497a00 + bb6633a + 6b7ed03 + 35fcae3 + 0737e9d + c31bf4c + 918649e + ecbe771 + b4124fc + f4e1da0 + a8c70a8 + 50d3c5d + 79180fa + f6f9386 + 8ed6590 + d79a4a4 + 3958052 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 0eeb6ff + 8c442a3 + adf1f8e + c2ceb18 + 9b17a1c + d5dab4a + 346a62a + 9808633 + bdeec54 + 1a2506a + f5f3d02 + b623064 + 4338bf4 + bdababf + 4054000 + 4449c16 + d3d8b33 + 8427cf8 + 8d162ec + a988e9a + 3e9d597 + ee93c08 + 9d3ce53 + f04a59c + 0c3f2de + a654383 + 502d937 + 93350ca + 23a0ccc + 15dc071 + 6ca79e9 + 7645850 + 7b0843e + b9f38cc + 53d4205 + 0ba91ba + 7ad75c4 + 35376fd + e6713be + b15c871 + 4121ed2 + 905626d + 529973a + e28e80a + b64275a + 2f43075 + 05dea5f + b0f56ea + a0ae2ac + 8b01bd8 + fc7acfc + 87b1ffc + c00475b + 6d05c34 + 2f2787b + 229c668 + c164e00 + e5c1ff6 + 5023ed3 + 3c689b8 + 789b92c + ae927c2 + 7741eac + ab3bdcd + 6c02989 + 0d17da2 + 1035d13 + 361c1cf + b31816b + 0102405 + 84330e4 + 50b28a7 + 196892e + 55ecf0a + cdf2159 + 97a5f0f + 2951d73 + bbfc15c + 7aff06a + 2ec87c8 + 9fd7105 + 090f966 + 295dff4 + d43b026 + 827fd02 + 5559cd9 + cfb3de6 + 80fffc8 + 08eb047 commit 44659b7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/Page/Mvc.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,18 @@ public function isActive($recursive = false)
$reqParams['controller'] = $reqParams[ModuleRouteListener::ORIGINAL_CONTROLLER];
}

$myParams = $this->params;
$pageParams = $this->params;
if (null !== $this->controller) {
$myParams['controller'] = $this->controller;
$pageParams['controller'] = $this->controller;
}
if (null !== $this->action) {
$myParams['action'] = $this->action;
$pageParams['action'] = $this->action;
}

if (null !== $this->getRoute()) {
if (
$this->routeMatch->getMatchedRouteName() === $this->getRoute()
&& (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams))
&& (count(array_intersect_assoc($reqParams, $pageParams)) == count($pageParams))
) {
$this->active = true;
return $this->active;
Expand All @@ -151,27 +151,27 @@ public function isActive($recursive = false)
}
}

$myParams = $this->params;
$pageParams = $this->params;

if (null !== $this->controller) {
$myParams['controller'] = $this->controller;
$pageParams['controller'] = $this->controller;
} else {
/**
* @todo In ZF1, this was configurable and pulled from the front controller
*/
$myParams['controller'] = 'index';
$pageParams['controller'] = 'index';
}

if (null !== $this->action) {
$myParams['action'] = $this->action;
$pageParams['action'] = $this->action;
} else {
/**
* @todo In ZF1, this was configurable and pulled from the front controller
*/
$myParams['action'] = 'index';
$pageParams['action'] = 'index';
}

if (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams)) {
if (count(array_intersect_assoc($reqParams, $pageParams)) == count($pageParams)) {
$this->active = true;
return true;
}
Expand Down

0 comments on commit 44659b7

Please sign in to comment.