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

Commit

Permalink
Merge pull request zendframework/zendframework#1850 from DASPRiD/hotf…
Browse files Browse the repository at this point in the history
…ix/variable-rename

Renamed variable to proper english wording
  • Loading branch information
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Helper/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ public function __invoke($name = null, array $params = array(), array $options =
}

if ($reuseMatchedParams && $this->routeMatch !== null) {
$paramsRouteMatch = $this->routeMatch->getParams();
$routeMatchParams = $this->routeMatch->getParams();

if (isset($paramsRouteMatch[ModuleRouteListener::ORIGINAL_CONTROLLER])) {
$paramsRouteMatch['controller'] = $paramsRouteMatch[ModuleRouteListener::ORIGINAL_CONTROLLER];
if (isset($routeMatchParams[ModuleRouteListener::ORIGINAL_CONTROLLER])) {
$routeMatchParams['controller'] = $routeMatchParams[ModuleRouteListener::ORIGINAL_CONTROLLER];
}

$params = array_merge($paramsRouteMatch, $params);
$params = array_merge($routeMatchParams, $params);
}

$options['name'] = $name;
Expand Down

0 comments on commit ffff3ea

Please sign in to comment.