diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 15:42:40 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 15:42:40 +0000 |
| commit | 7e745f3aa5de4e117758ee92e2ca92aa265c6deb (patch) | |
| tree | a98c346b62f52b4cf8197086ae8b731a3695c5f3 /actionpack/lib/action_controller/routing.rb | |
| parent | 6cd3bda32f6183f2e31a3b62e35c01655e8debc4 (diff) | |
| download | rails-7e745f3aa5de4e117758ee92e2ca92aa265c6deb.tar.gz rails-7e745f3aa5de4e117758ee92e2ca92aa265c6deb.tar.bz2 rails-7e745f3aa5de4e117758ee92e2ca92aa265c6deb.zip | |
Added to_param call for parameters when composing an url using url_for from something else than strings #812 [Sam Stephenson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index c021d88ca9..20bc6c8cae 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -64,9 +64,9 @@ module ActionController if value.nil? || item == :controller value elsif collection - CGI.escape(value.to_s).gsub(/%2F/, "/") + Routing.extract_parameter_value(value).gsub(/%2F/, "/") else - CGI.escape(value.to_s) + Routing.extract_parameter_value(value) end else item @@ -316,6 +316,11 @@ module ActionController end end + def self.extract_parameter_value(parameter) + value = parameter.respond_to?(:to_param) ? parameter.to_param : parameter.to_s + CGI.escape(value) + end + def self.draw(*args, &block) #:nodoc: Routes.draw(*args) {|*args| block.call(*args)} end |