diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-03 14:56:19 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-03 14:56:19 +0200 |
| commit | 3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a (patch) | |
| tree | df534932145e9527e0aad6759919e21e9ffc9279 /actionpack/lib/action_controller/routing | |
| parent | b7bc68076c50714977aa7e990273a2ec92ba2e15 (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.tar.gz rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.tar.bz2 rails-3bf45890b323d0fbb5dbfa3e3a2e8f85c627679a.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/route_set.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb index 87b4b0571c..f5a4b1e1db 100644 --- a/actionpack/lib/action_controller/routing/route_set.rb +++ b/actionpack/lib/action_controller/routing/route_set.rb @@ -305,6 +305,7 @@ module ActionController end def add_route(path, options = {}) + options.each { |k, v| options[k] = v.to_s if [:controller, :action].include?(k) && v.is_a?(Symbol) } route = builder.build(path, options) routes << route route |