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

Routes from Engine Railties should not be an infinite loop

Browse source
This commit is contained in:
Aaron Patterson 2018-09-26 11:10:25 -07:00
parent 6060a1d97b
commit b50f7ae627
No known key found for this signature in database
GPG key ID: 953170BCB4FFAFC6
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -444,8 +444,10 @@ module ActionDispatch
end
def include_helpers_now(klass, include_path_helpers)
if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) }
klass.include(namespace.railtie_routes_url_helpers(include_path_helpers))
namespace = klass.parents.detect { |m| m.respond_to?(:railtie_include_helpers) }
if namespace && namespace.railtie_namespace.routes != self
namespace.railtie_include_helpers(klass, include_path_helpers)
else
klass.include(url_helpers(include_path_helpers))
end

6
railties/lib/rails/engine.rb
View file

@ -403,6 +403,12 @@ module Rails
define_method(:railtie_helpers_paths) { railtie.helpers_paths }
end
unless mod.respond_to?(:railtie_include_helpers)
define_method(:railtie_include_helpers) { |klass, include_path_helpers|
railtie.routes.include_helpers(klass, include_path_helpers)
}
end
unless mod.respond_to?(:railtie_routes_url_helpers)
define_method(:railtie_routes_url_helpers) { |include_path_helpers = true| railtie.routes.url_helpers(include_path_helpers) }
end