diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-17 17:15:33 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-17 17:15:33 -0700 |
| commit | cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22 (patch) | |
| tree | 48d9c8ab7f30e7962e7a4d0ce3759a8996625e3b /activesupport/lib | |
| parent | 364879c61e68a1090eacb65481a3555298452141 (diff) | |
| parent | 3a04e370e4cc016bb7b59fe6bb704e4ca37d62f3 (diff) | |
| download | rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.tar.gz rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.tar.bz2 rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.zip | |
Merge pull request #3049 from brainopia/fix_to_query_edge_case
Fix Hash#to_query edge case with html_safe string on 1.8 ruby
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/to_query.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/to_query.rb b/activesupport/lib/active_support/core_ext/object/to_query.rb index 3f1540f685..5d5fcf00e0 100644 --- a/activesupport/lib/active_support/core_ext/object/to_query.rb +++ b/activesupport/lib/active_support/core_ext/object/to_query.rb @@ -7,7 +7,7 @@ class Object # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work. def to_query(key) require 'cgi' unless defined?(CGI) && defined?(CGI::escape) - "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}" + "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}" end end |