aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-02 08:35:32 -0800
committerJosé Valim <jose.valim@gmail.com>2012-03-02 08:35:32 -0800
commitd08a7c18183e74707f5f734f696c7e1cd1acd050 (patch)
tree4e79c4d605e231a36a6ee95714f1cdfa1ff647de
parent1a046ab9bf7f0c3fa045a2b771a5a22d318f02ff (diff)
parent0e6b588b3df595cecd18eb523f5f75c413df8277 (diff)
downloadrails-d08a7c18183e74707f5f734f696c7e1cd1acd050.tar.gz
rails-d08a7c18183e74707f5f734f696c7e1cd1acd050.tar.bz2
rails-d08a7c18183e74707f5f734f696c7e1cd1acd050.zip
Merge pull request #5243 from lest/patch-2
don't pass unnecessary argument
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb4
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 c4d87ea3d9..30e9e5634b 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -191,7 +191,7 @@ module ActionDispatch
selector = url_helper_name(name, kind)
hash_access_method = hash_access_name(name, kind)
- if optimize_helper?(kind, route)
+ if optimize_helper?(route)
@module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
remove_possible_method :#{selector}
def #{selector}(*args)
@@ -217,7 +217,7 @@ module ActionDispatch
end
# Clause check about when we need to generate an optimized helper.
- def optimize_helper?(kind, route) #:nodoc:
+ def optimize_helper?(route) #:nodoc:
route.ast.grep(Journey::Nodes::Star).empty? && route.requirements.except(:controller, :action).empty?
end