diff options
| author | Bogdan Gusiev <agresso@gmail.com> | 2012-08-04 14:55:00 +0300 |
|---|---|---|
| committer | Bogdan Gusiev <agresso@gmail.com> | 2012-08-04 14:55:00 +0300 |
| commit | d89161e7cc52a03455bf6d3b38a6c1a4b7adb524 (patch) | |
| tree | 9935c17d7aca587ce7330cc2763f7c0b7b1fd29c /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 422b3d70d5aba24e6a8f94722db449d5647f22d3 (diff) | |
| download | rails-d89161e7cc52a03455bf6d3b38a6c1a4b7adb524.tar.gz rails-d89161e7cc52a03455bf6d3b38a6c1a4b7adb524.tar.bz2 rails-d89161e7cc52a03455bf6d3b38a6c1a4b7adb524.zip | |
Renamed _path_segments to _recall
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index acf2861730..d68d0c88b3 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -605,13 +605,13 @@ module ActionDispatch options = default_url_options.merge(options || {}) user, password = extract_authentication(options) - path_segments = options.delete(:_path_segments) + recall = options.delete(:_recall) script_name = options.delete(:script_name).presence || _generate_prefix(options) path_options = options.except(*RESERVED_OPTIONS) path_options = yield(path_options) if block_given? - path, params = generate(path_options, path_segments || {}) + path, params = generate(path_options, recall || {}) params.merge!(options[:params] || {}) ActionDispatch::Http::URL.url_for(options.merge!({ |