Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

pull stuff out of the caller and hide in the instance

  • Loading branch information...
commit 06f2ec4530ccf28a3da67b037b541d34ecef4658 1 parent 2cdbe22
Aaron Patterson tenderlove authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 actionpack/lib/action_dispatch/routing/route_set.rb
7 actionpack/lib/action_dispatch/routing/route_set.rb
View
@@ -203,9 +203,9 @@ def url_else(t, args)
t.url_for(handle_positional_args(t, args, @options, @segment_keys))
end
- def url_if(t, path)
+ def url_if(t, args)
@options.merge!(t.url_options) if t.respond_to?(:url_options)
- @options[:path] = path
+ @options[:path] = eval("\"#{optimized_helper}\"")
ActionDispatch::Http::URL.url_for(@options)
end
@@ -242,7 +242,6 @@ def define_url_helper(route, name, options)
helper = UrlHelper.create(route, options.dup)
ohelp = helper.optimize_helper?
- ohelper = helper.optimized_helper
arg_size = route.required_parts.size
@module.module_eval do
@@ -250,7 +249,7 @@ def define_url_helper(route, name, options)
#helper.call t, args
if ohelp && args.size == arg_size && !args.last.is_a?(Hash) && optimize_routes_generation?
- helper.url_if(self, eval("\"#{ohelper}\""))
+ helper.url_if(self, args)
else
helper.url_else(self, args)
end
Please sign in to comment.
Something went wrong with that request. Please try again.