diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-03 13:56:12 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-03 13:56:12 -0800 |
| commit | e9122112facf56131d4bf0739382d9235582f8c0 (patch) | |
| tree | 61e46b5bdd495cab412371ce7734cfb7f9e2bab3 /actionpack/lib/action_dispatch | |
| parent | c4a29de0e0706c7a8e7641f099eedaaf60c185ec (diff) | |
| download | rails-e9122112facf56131d4bf0739382d9235582f8c0.tar.gz rails-e9122112facf56131d4bf0739382d9235582f8c0.tar.bz2 rails-e9122112facf56131d4bf0739382d9235582f8c0.zip | |
Revert "Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)"
This reverts commit 71d769e3b58cb56b4b1d5143936c65be8b27c490.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 6d6de36a08..4760887456 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -356,7 +356,7 @@ module ActionDispatch conditions = build_conditions(conditions, valid_conditions, path.names.map { |x| x.to_sym }) route = @set.add_route(app, path, conditions, defaults, name) - named_routes[name] = route if name && !named_routes[name] + named_routes[name] = route if name route end |