aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 121e7c2c75..c67b0199ce 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -301,11 +301,13 @@ module ActionDispatch
MountedHelpers
end
- def define_mounted_helper(name, helpers = nil)
+ def define_mounted_helper(name)
+ return if MountedHelpers.method_defined?(name)
+
routes = self
MountedHelpers.class_eval do
define_method "_#{name}" do
- RoutesProxy.new(routes, self)
+ RoutesProxy.new(routes, (self.respond_to?(:controller) ? controller : self))
end
end