Skip to content

Commit

Permalink
Fix for issue codeigniter4#612
Browse files Browse the repository at this point in the history
This fixes an issue with route groups and route options not merging correctly.
  • Loading branch information
daylightstudio authored Jul 17, 2017
1 parent 5eef935 commit 08acac1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions system/Router/RouteCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -1117,10 +1117,7 @@ protected function create(string $from, $to, array $options = null)
$from = trim($from, '/');
}

if (is_null($options))
{
$options = $this->currentOptions;
}
$options = array_merge((array)$this->currentOptions, (array)$options);

// Hostname limiting?
if (isset($options['hostname']) && ! empty($options['hostname']))
Expand Down

0 comments on commit 08acac1

Please sign in to comment.