aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-02 01:32:08 +0100
committerJosé Valim <jose.valim@gmail.com>2012-03-02 01:59:03 +0100
commitd7014bc7eaa62c36f045a503cdad64e4ebbc2687 (patch)
tree4e3f61401118514fd4f4eb3de2721bada019f44c /actionpack/lib/action_dispatch/http
parentfcef72890b7f8b974ee490268a48e147bd621253 (diff)
downloadrails-d7014bc7eaa62c36f045a503cdad64e4ebbc2687.tar.gz
rails-d7014bc7eaa62c36f045a503cdad64e4ebbc2687.tar.bz2
rails-d7014bc7eaa62c36f045a503cdad64e4ebbc2687.zip
Optimize path helpers.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r--actionpack/lib/action_dispatch/http/url.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 80ffbe575b..f9dae5dad7 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -40,7 +40,9 @@ module ActionDispatch
rewritten_url << ":#{options.delete(:port)}" if options[:port]
end
- path = options.delete(:path) || ''
+ path = ""
+ path << options.delete(:script_name).to_s.chomp("/")
+ path << options.delete(:path).to_s
params = options[:params] || {}
params.reject! {|k,v| v.to_param.nil? }