diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-07 19:12:02 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-07 19:12:02 +0000 |
| commit | d9f3c435f907b8097669a7f2c923f731837fb045 (patch) | |
| tree | 68826445dfcadb167950e318f19c807711971d9c /actionpack/lib/action_controller/routing.rb | |
| parent | c90d31eb376ebe331394112697ec33a22f61c2d8 (diff) | |
| download | rails-d9f3c435f907b8097669a7f2c923f731837fb045.tar.gz rails-d9f3c435f907b8097669a7f2c923f731837fb045.tar.bz2 rails-d9f3c435f907b8097669a7f2c923f731837fb045.zip | |
Fix url_for, redirect_to, etc. with :controller => :symbol instead of 'string'. Closes #8562, #9525.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 7442adbb39..3a4d2aafe3 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -1325,6 +1325,9 @@ module ActionController options = options_as_params(options) expire_on = build_expiry(options, recall) + if options[:controller] + options[:controller] = options[:controller].to_s + end # if the controller has changed, make sure it changes relative to the # current controller module, if any. In other words, if we're currently # on admin/get, and the new controller is 'set', the new controller |