aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-27 15:56:16 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-27 15:56:16 -0300
commitd395391e1dfae4531671fbb09911e6b9418474ba (patch)
tree65d679e11c15de32c18a4303d6dcb9f88f2a0925 /actionpack/lib/action_controller/routing
parent286f47f3b034db4550110b9a0f9ff48dda29e807 (diff)
parentc10396b1426fcddea35d88fe865846b8aaab5de4 (diff)
downloadrails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.gz
rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.bz2
rails-d395391e1dfae4531671fbb09911e6b9418474ba.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/routing')
-rw-r--r--actionpack/lib/action_controller/routing/generation/url_rewriter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/generation/url_rewriter.rb b/actionpack/lib/action_controller/routing/generation/url_rewriter.rb
index 9717582b5e..52b66c9303 100644
--- a/actionpack/lib/action_controller/routing/generation/url_rewriter.rb
+++ b/actionpack/lib/action_controller/routing/generation/url_rewriter.rb
@@ -172,7 +172,7 @@ module ActionController
path = rewrite_path(options)
rewritten_url << ActionController::Base.relative_url_root.to_s unless options[:skip_relative_url_root]
rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
- rewritten_url << "##{options[:anchor]}" if options[:anchor]
+ rewritten_url << "##{CGI.escape(options[:anchor].to_param.to_s)}" if options[:anchor]
rewritten_url
end