kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "reduce conditionals in url_for"

Browse source 
This reverts commit 9df60693d7.
This commit is contained in:
Aaron Patterson 2014-05-12 16:20:52 -07:00
parent 547881594b
commit 3ccd24a33f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -655,7 +655,7 @@ module ActionDispatch
options = default_url_options.merge(options || {})
user, password = extract_authentication(options)
recall = options.delete(:_recall) { {} }
recall = options.delete(:_recall)
original_script_name = options.delete(:original_script_name).presence
script_name = options.delete(:script_name).presence || _generate_prefix(options)
@ -668,11 +668,8 @@ module ActionDispatch
RESERVED_OPTIONS.each { |ro| path_options.delete ro }
path_options = yield(path_options) if block_given?
path, params = generate(path_options, recall)
if options.key? :params
params.merge! options[:params]
end
path, params = generate(path_options, recall || {})
params.merge!(options[:params] || {})
ActionDispatch::Http::URL.url_for(options.merge!({
:path => path,