Skip to content

Commit

Permalink
Cleanup coding conventions; Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
sveriger committed Feb 8, 2013
1 parent c3184c8 commit 19962ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Each filter set that you specify has the following options:
- `cache` - override the default cache setting
- `data_loader` - override the default data loader
- `controller_action` - override the default controller action
- `route` - optional list of route requirements, defaults and options using in the route loader. Add array width keys 'requirements', 'defaults' or 'options'.
- `route` - optional list of route requirements, defaults and options using in the route loader. Add array with keys 'requirements', 'defaults' or 'options'.

default: empty array

Expand Down
6 changes: 3 additions & 3 deletions Routing/ImagineLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public function load($resource, $type = null)
$routeDefaults = $defaults;
$routeOptions = array();

if(isset($config['route']['requirements'])) {
if (isset($config['route']['requirements'])) {
$routeRequirements = array_merge($routeRequirements, $config['route']['requirements']);
}
if(isset($config['route']['defaults'])) {
if (isset($config['route']['defaults'])) {
$routeDefaults = array_merge($routeDefaults, $config['route']['defaults']);
}
if(isset($config['route']['options'])) {
if (isset($config['route']['options'])) {
$routeOptions = array_merge($routeOptions, $config['route']['options']);
}

Expand Down

0 comments on commit 19962ce

Please sign in to comment.