diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-12-30 14:47:51 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-12-30 14:48:10 -0800 |
| commit | 87a75910640b83a677099198ccb3317d9850c204 (patch) | |
| tree | 9045169315eb1185b81d4061457672d7eb7d3078 /actionpack/lib/action_controller/metal | |
| parent | 77a9486ba66fc873e990f275e6ae1a5b56688f6c (diff) | |
| download | rails-87a75910640b83a677099198ccb3317d9850c204.tar.gz rails-87a75910640b83a677099198ccb3317d9850c204.tar.bz2 rails-87a75910640b83a677099198ccb3317d9850c204.zip | |
use methods on the request rather than direct hash access
this will help decouple us from using the rack env hash
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 0f2fa5fb08..847f08c25d 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -30,9 +30,9 @@ module ActionController :_recall => request.path_parameters }.merge!(super).freeze - if (same_origin = _routes.equal?(env["action_dispatch.routes".freeze])) || + if (same_origin = _routes.equal?(request.routes)) || (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) || - (original_script_name = env['ORIGINAL_SCRIPT_NAME'.freeze]) + (original_script_name = request.original_script_name) options = @_url_options.dup if original_script_name |