Skip to content

Commit 6671922

Browse files
authored
Merge pull request #617 from daylightstudio/daylightstudio-patch-1
Fix for issue #612
2 parents 5eef935 + 08acac1 commit 6671922

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

system/Router/RouteCollection.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,10 +1117,7 @@ protected function create(string $from, $to, array $options = null)
11171117
$from = trim($from, '/');
11181118
}
11191119

1120-
if (is_null($options))
1121-
{
1122-
$options = $this->currentOptions;
1123-
}
1120+
$options = array_merge((array)$this->currentOptions, (array)$options);
11241121

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

0 commit comments

Comments
 (0)