diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-09 10:25:10 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:06 +0200 |
| commit | b697ba9fd72ac8701747863b42082e59f13ba678 (patch) | |
| tree | b89e392dbfccd29a7fc2d6c0d877503a96a4f016 /actionpack/lib/action_controller | |
| parent | 8a077089d9b7aa89cb56ef754b4540f411453375 (diff) | |
| download | rails-b697ba9fd72ac8701747863b42082e59f13ba678.tar.gz rails-b697ba9fd72ac8701747863b42082e59f13ba678.tar.bz2 rails-b697ba9fd72ac8701747863b42082e59f13ba678.zip | |
Added some more tests for url generation between Engine and Application
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index ae628df81c..c1f1be3bef 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -5,10 +5,10 @@ module ActionController include ActionDispatch::Routing::UrlFor def url_options - options = {} - if respond_to?(:env) && env && _routes.equal?(env["action_dispatch.routes"]) - options[:script_name] = request.script_name - end + options = {} + if respond_to?(:env) && env && _routes.equal?(env["action_dispatch.routes"]) + options[:script_name] = request.script_name + end super.merge(options).reverse_merge( :host => request.host_with_port, |