aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-14 23:24:47 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-14 23:24:47 +0000
commit90f78e2bd14d2aa6c14ad132bdcdc4270fac0077 (patch)
treeb0776e9a160572ce13ab27b12eef5ed6fba78ad5
parent82aff27c043d3335277e18e3bd283e5b09b198fb (diff)
downloadrails-90f78e2bd14d2aa6c14ad132bdcdc4270fac0077.tar.gz
rails-90f78e2bd14d2aa6c14ad132bdcdc4270fac0077.tar.bz2
rails-90f78e2bd14d2aa6c14ad132bdcdc4270fac0077.zip
Fixed :anchor use in url_for #821 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 1885126032..e1e86d3e55 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed :anchor use in url_for #821 [Nicholas Seckar]
+
* Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 [Nicholas Seckar]
* Added assigns shortcut for @response.template.assigns to controller test cases [bitsweat]. Example:
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 609de9deed..9156e6325a 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -8,7 +8,7 @@ module ActionView
# Returns the URL for the set of +options+ provided. This takes the same options
# as url_for. For a list, see the url_for documentation in link:classes/ActionController/Base.html#M000079.
def url_for(options = {}, *parameters_for_method_reference)
- if Hash === options then options = { :only_path => true }.update(options.stringify_keys) end
+ options = { :only_path => true }.update(options.symbolize_keys) if options.kind_of? Hash
@controller.send(:url_for, options, *parameters_for_method_reference)
end