From 06f2ec4530ccf28a3da67b037b541d34ecef4658 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 25 Jan 2013 10:19:37 -0800 Subject: [PATCH] pull stuff out of the caller and hide in the instance --- actionpack/lib/action_dispatch/routing/route_set.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 4864475172..6c4315213c 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -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 -- GitLab